From 6ed19dcf80fbc53faeb5a43e0104e4213973b014 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Fri, 13 Oct 2017 20:43:01 +0200 Subject: [PATCH] spirv_extensions: add spirv_supported_extensions on gl_constants MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We can use it to get real values for ARB_spirv_extensions methods. Signed-off-by: Alejandro Piñeiro Signed-off-by: Arcady Goldmints-Orlov Reviewed-by: Caio Marcelo de Oliveira Filho --- src/mesa/main/mtypes.h | 3 +++ src/mesa/main/spirv_extensions.c | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 745b243254a..1313ea2a579 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4128,6 +4128,9 @@ struct gl_constants /** GL_ARB_gl_spirv */ struct spirv_supported_capabilities SpirVCapabilities; + + /** GL_ARB_spirv_extensions */ + struct spirv_supported_extensions *SpirVExtensions; }; diff --git a/src/mesa/main/spirv_extensions.c b/src/mesa/main/spirv_extensions.c index 99af4db2ba0..4dd637b6607 100644 --- a/src/mesa/main/spirv_extensions.c +++ b/src/mesa/main/spirv_extensions.c @@ -32,13 +32,30 @@ GLuint _mesa_get_spirv_extension_count(struct gl_context *ctx) { - return 0; + if (ctx->Const.SpirVExtensions == NULL) + return 0; + + return ctx->Const.SpirVExtensions->count; } const GLubyte * _mesa_get_enabled_spirv_extension(struct gl_context *ctx, GLuint index) { + unsigned int n = 0; + + if (ctx->Const.SpirVExtensions == NULL) + return (const GLubyte *) 0; + + for (unsigned int i = 0; i < SPV_EXTENSIONS_COUNT; i++) { + if (ctx->Const.SpirVExtensions->supported[i]) { + if (n == index) + return (const GLubyte *) _mesa_spirv_extensions_to_string(i); + else + n++; + } + } + return (const GLubyte *) 0; } -- 2.30.2