spirv_extensions: add list of extensions and to_string method

Ideally this should be generated somehow. One option would be gather
all the extension dependencies listed on the core grammar, but there
would be the possibility of not including some of the extensions.

Note that spirv-tools is doing it just slightly better, as it has a
hardcoded list of extensions manually took from the registry, that
they parse to get the enum and the to_string method (see
generate_grammar_tables.py).

v2:
  * Use a macro to improve readability. (Tapani Pälli)
  * Add unreachable on the switch, no default (Eric Engestrom)
  * No typedef enum (Ian Romanick)
  * Sort extensions names (Ian Romanick)
  * Don't add extensions unlikely to be supported by Mesa at any point
    (Ian Romanick)

v3: rebase update

v4: Include AMD_gcn_shader

v5: move spirv_extensions_to_string to src/mesa/main/spirv_extensions.c

Signed-off-by: Alejandro Piñeiro <apinheiro@igalia.com>
Signed-off-by: Arcady Goldmints-Orlov <agoldmints@igalia.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>

diff --git a/src/mesa/main/spirv_extensions.c b/src/mesa/main/spirv_extensions.c
index 40a89c133aa7a0f29041e1826fcac82c4d54b471..7598510e21c60d5c421a8daa14bad233ec0efec7 100644 (file)
--- a/src/mesa/main/spirv_extensions.c
+++ b/src/mesa/main/spirv_extensions.c
@@ -40,3 +40,25 @@ _mesa_get_enabled_spirv_extension(struct gl_context *ctx,
 {
    return (const GLubyte *) 0;
 }
+
+const char *
+_mesa_spirv_extensions_to_string(enum SpvExtension ext)
+{
+#define STR(x) case x: return #x;
+   switch (ext) {
+   STR(SPV_KHR_16bit_storage);
+   STR(SPV_KHR_device_group);
+   STR(SPV_KHR_multiview);
+   STR(SPV_KHR_shader_ballot);
+   STR(SPV_KHR_shader_draw_parameters);
+   STR(SPV_KHR_storage_buffer_storage_class);
+   STR(SPV_KHR_subgroup_vote);
+   STR(SPV_KHR_variable_pointers);
+   STR(SPV_AMD_gcn_shader);
+   case SPV_EXTENSIONS_COUNT:
+      unreachable("Unknown SPIR-V extension");
+   }
+#undef STR
+
+   return "unknown";
+}

diff --git a/src/mesa/main/spirv_extensions.h b/src/mesa/main/spirv_extensions.h
index 35754f7e53b84bce66c869f7e5b8b87a5b2d2770..6c8b82759459259837cbebc087ba8e4c19405ad3 100644 (file)
--- a/src/mesa/main/spirv_extensions.h
+++ b/src/mesa/main/spirv_extensions.h
@@ -35,6 +35,19 @@
 extern "C" {
 #endif
 
+enum SpvExtension {
+   SPV_KHR_16bit_storage = 0,
+   SPV_KHR_device_group,
+   SPV_KHR_multiview,
+   SPV_KHR_shader_ballot,
+   SPV_KHR_shader_draw_parameters,
+   SPV_KHR_storage_buffer_storage_class,
+   SPV_KHR_subgroup_vote,
+   SPV_KHR_variable_pointers,
+   SPV_AMD_gcn_shader,
+   SPV_EXTENSIONS_COUNT
+};
+
 extern GLuint
 _mesa_get_spirv_extension_count(struct gl_context *ctx);
 
@@ -42,6 +55,8 @@ extern const GLubyte *
 _mesa_get_enabled_spirv_extension(struct gl_context *ctx,
                                   GLuint index);
 
+const char *_mesa_spirv_extensions_to_string(enum SpvExtension ext);
+
 #ifdef __cplusplus
 }
 #endif