Module: Mesa Branch: master Commit: 5a8496007202f065efb3734e5925717268efc226 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a8496007202f065efb3734e5925717268efc226
Author: Alejandro Piñeiro <[email protected]> Date: Sat Oct 14 10:52:51 2017 +0200 spirv_extensions: i965: initialize SPIR-V extensions v2: Rebase update after changes on previous patches. Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]> --- src/mesa/drivers/dri/i965/brw_context.c | 11 ++++++++++- src/mesa/main/context.c | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index c3d4784e94c..3783d1532e9 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -46,6 +46,7 @@ #include "main/framebuffer.h" #include "main/stencil.h" #include "main/state.h" +#include "main/spirv_extensions.h" #include "vbo/vbo.h" @@ -1126,9 +1127,17 @@ brwCreateContext(gl_api api, _mesa_compute_version(ctx); /* GL_ARB_gl_spirv */ - if (ctx->Extensions.ARB_gl_spirv) + if (ctx->Extensions.ARB_gl_spirv) { brw_initialize_spirv_supported_capabilities(brw); + if (ctx->Extensions.ARB_spirv_extensions) { + /* GL_ARB_spirv_extensions */ + ctx->Const.SpirVExtensions = MALLOC_STRUCT(spirv_supported_extensions); + _mesa_fill_supported_spirv_extensions(ctx->Const.SpirVExtensions, + &ctx->Const.SpirVCapabilities); + } + } + _mesa_initialize_dispatch_tables(ctx); _mesa_initialize_vbo_vtxfmt(ctx); diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 42fb404b50e..6e11f88cf1b 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1403,6 +1403,8 @@ _mesa_free_context_data(struct gl_context *ctx, bool destroy_compiler_types) if (ctx == _mesa_get_current_context()) { _mesa_make_current(NULL, NULL, NULL); } + + free(ctx->Const.SpirVExtensions); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
