Mesa (master): spirv/radv: add AMD_gcn_shader capability, remove current extensions

[Alejandro Pinheiro]

Module: Mesa
Branch: master
Commit: 50767214a790889120975bf0f598996c4f887dfc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=50767214a790889120975bf0f598996c4f887dfc

Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date:   Thu Mar  8 12:43:00 2018 +0100

spirv/radv: add AMD_gcn_shader capability, remove current extensions

So now, during spirv_to_nir, it uses the capability instead of the
extension. Note that we are really doing here is treating
SPV_AMD_gcn_shader as other supported extensions. SPV_AMD_gcn_shader
is not the first SPV extension supported. For example, the capability
draw_parameters infers if the extension SPV_KHR_shader_draw_parameters
is supported or not.

This could be seen as counter-intuitive, and that it would be easier
to define which extensions are supported, and based our checks on
that, but we need to take into account that some capabilities are
optional from core, and others came from new extensions.

Also this commit would make the implementation of ARB_spirv_extensions
easier.

v2: AMD_gcn_shader capability renamed to gcn_shader (Daniel Schürmann)

Reviewed-by: Daniel Schürmann <daniel.schuermann at campus.tu-berlin.de>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_shader.c      | 4 +---
 src/compiler/shader_info.h        | 6 +-----
 src/compiler/spirv/nir_spirv.h    | 1 -
 src/compiler/spirv/spirv_to_nir.c | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 3eddc089d4..2fc7060d6c 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -214,9 +214,7 @@ radv_shader_compile_to_nir(struct radv_device *device,
 				.multiview = true,
 				.subgroup_basic = true,
 				.variable_pointers = true,
-			},
-			.exts = {
-				.AMD_gcn_shader = true,
+				.gcn_shader = true,
 			},
 		};
 		entry_point = spirv_to_nir(spirv, module->size / 4,
diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index b1e200070f..0eeb2ca58e 100644
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -51,11 +51,7 @@ struct spirv_supported_capabilities {
    bool subgroup_quad;
    bool subgroup_shuffle;
    bool subgroup_vote;
-};
-
-/* The supported extensions which add extended instructions */
-struct spirv_supported_extensions {
-   bool AMD_gcn_shader;
+   bool gcn_shader;
 };
 
 typedef struct shader_info {
diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index 2b0bdaec01..a2c40e57d1 100644
--- a/src/compiler/spirv/nir_spirv.h
+++ b/src/compiler/spirv/nir_spirv.h
@@ -59,7 +59,6 @@ struct spirv_to_nir_options {
    bool lower_workgroup_access_to_offsets;
 
    struct spirv_supported_capabilities caps;
-   struct spirv_supported_extensions exts;
 
    struct {
       void (*func)(void *private_data,
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index df01f4ff4a..f06dca90ef 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -376,7 +376,7 @@ vtn_handle_extension(struct vtn_builder *b, SpvOp opcode,
       if (strcmp((const char *)&w[2], "GLSL.std.450") == 0) {
          val->ext_handler = vtn_handle_glsl450_instruction;
       } else if ((strcmp((const char *)&w[2], "SPV_AMD_gcn_shader") == 0)
-                && (b->options && b->options->exts.AMD_gcn_shader)) {
+                && (b->options && b->options->caps.gcn_shader)) {
          val->ext_handler = vtn_handle_amd_gcn_shader_instruction;
       } else {
          vtn_fail("Unsupported extension");