SPV: add version checks for AMD type extensions.

I'm not yet clear if these are the right checks, but it puts the right infrastructure and example in place. Note: semantic checking against versions/extensions should happen earlier than SPIR-V generation, so SPIR-V generation need only assume it is okay to do what was asked.

SPV: add version checks for AMD type extensions.
66bdc47f · John Kessenich · 1790a40c · 66bdc47f · 66bdc47f
Commit 66bdc47f authored Feb 23, 2018 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

GlslangToSpv.cpp SPIRV/GlslangToSpv.cpp +6 -3

SpvBuilder.h SPIRV/SpvBuilder.h +2 -0

No files found.
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -2452,7 +2452,8 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
    case glslang::EbtFloat16:
        builder.addCapability(spv::CapabilityFloat16);
 #if AMD_EXTENSIONS
-        builder.addExtension(spv::E_SPV_AMD_gpu_shader_half_float);
+        if (builder.getSpvVersion() < 0x00010300)
+            builder.addExtension(spv::E_SPV_AMD_gpu_shader_half_float);
 #endif
        spvType = builder.makeFloatType(16);
        break;
@@ -2475,14 +2476,16 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
   case glslang::EbtInt16:
        builder.addCapability(spv::CapabilityInt16);
 #ifdef AMD_EXTENSIONS
-        builder.addExtension(spv::E_SPV_AMD_gpu_shader_int16);
+        if (builder.getSpvVersion() < 0x00010300)
+            builder.addExtension(spv::E_SPV_AMD_gpu_shader_int16);
 #endif
        spvType = builder.makeIntType(16);
        break;
    case glslang::EbtUint16:
        builder.addCapability(spv::CapabilityInt16);
 #ifdef AMD_EXTENSIONS
-        builder.addExtension(spv::E_SPV_AMD_gpu_shader_int16);
+        if (builder.getSpvVersion() < 0x00010300)
+            builder.addExtension(spv::E_SPV_AMD_gpu_shader_int16);
 #endif
        spvType = builder.makeUintType(16);
        break;

--- a/SPIRV/SpvBuilder.h
+++ b/SPIRV/SpvBuilder.h
@@ -66,6 +66,8 @@ public:
    static const int maxMatrixSize = 4;
+    unsigned int getSpvVersion() const { return spvVersion; }
    void setSource(spv::SourceLanguage lang, int version)
    {
        source = lang;