Merge pull request #2427 from ben-clayton/gn
Kokoro: Add configurations for GN presubmit
diff --git a/SPIRV/GLSL.ext.KHR.h b/SPIRV/GLSL.ext.KHR.h
index d783a8f..2be968e 100644
--- a/SPIRV/GLSL.ext.KHR.h
+++ b/SPIRV/GLSL.ext.KHR.h
@@ -48,4 +48,5 @@
static const char* const E_SPV_KHR_non_semantic_info = "SPV_KHR_non_semantic_info";
static const char* const E_SPV_KHR_ray_tracing = "SPV_KHR_ray_tracing";
static const char* const E_SPV_KHR_ray_query = "SPV_KHR_ray_query";
+static const char* const E_SPV_KHR_fragment_shading_rate = "SPV_KHR_fragment_shading_rate";
#endif // #ifndef GLSLextKHR_H
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index c855416..d32c646 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -769,6 +769,16 @@
builder.addCapability(spv::CapabilityStencilExportEXT);
return spv::BuiltInFragStencilRefEXT;
+ case glslang::EbvShadingRateKHR:
+ builder.addExtension(spv::E_SPV_KHR_fragment_shading_rate);
+ builder.addCapability(spv::CapabilityFragmentShadingRateKHR);
+ return spv::BuiltInShadingRateKHR;
+
+ case glslang::EbvPrimitiveShadingRateKHR:
+ builder.addExtension(spv::E_SPV_KHR_fragment_shading_rate);
+ builder.addCapability(spv::CapabilityFragmentShadingRateKHR);
+ return spv::BuiltInPrimitiveShadingRateKHR;
+
case glslang::EbvInvocationId: return spv::BuiltInInvocationId;
case glslang::EbvTessLevelInner: return spv::BuiltInTessLevelInner;
case glslang::EbvTessLevelOuter: return spv::BuiltInTessLevelOuter;
diff --git a/SPIRV/doc.cpp b/SPIRV/doc.cpp
index 1d052f8..b1d7eb7 100644
--- a/SPIRV/doc.cpp
+++ b/SPIRV/doc.cpp
@@ -372,6 +372,8 @@
case 4424: return "BaseVertex";
case 4425: return "BaseInstance";
case 4426: return "DrawIndex";
+ case 4432: return "PrimitiveShadingRateKHR";
+ case 4444: return "ShadingRateKHR";
case 5014: return "FragStencilRefEXT";
case 4992: return "BaryCoordNoPerspAMD";
@@ -952,6 +954,8 @@
case CapabilityFragmentShaderPixelInterlockEXT: return "CapabilityFragmentShaderPixelInterlockEXT";
case CapabilityFragmentShaderShadingRateInterlockEXT: return "CapabilityFragmentShaderShadingRateInterlockEXT";
+ case CapabilityFragmentShadingRateKHR: return "FragmentShadingRateKHR";
+
case CapabilityDemoteToHelperInvocationEXT: return "DemoteToHelperInvocationEXT";
case CapabilityShaderClockKHR: return "ShaderClockKHR";
diff --git a/SPIRV/spirv.hpp b/SPIRV/spirv.hpp
index 35482ea..26b35bb 100644
--- a/SPIRV/spirv.hpp
+++ b/SPIRV/spirv.hpp
@@ -274,6 +274,8 @@
ImageFormatRg8ui = 37,
ImageFormatR16ui = 38,
ImageFormatR8ui = 39,
+ ImageFormatR64ui = 40,
+ ImageFormatR64i = 41,
ImageFormatMax = 0x7fffffff,
};
@@ -558,8 +560,10 @@
BuiltInBaseVertex = 4424,
BuiltInBaseInstance = 4425,
BuiltInDrawIndex = 4426,
+ BuiltInPrimitiveShadingRateKHR = 4432,
BuiltInDeviceIndex = 4438,
BuiltInViewIndex = 4440,
+ BuiltInShadingRateKHR = 4444,
BuiltInBaryCoordNoPerspAMD = 4992,
BuiltInBaryCoordNoPerspCentroidAMD = 4993,
BuiltInBaryCoordNoPerspSampleAMD = 4994,
@@ -870,6 +874,7 @@
CapabilityGroupNonUniformQuad = 68,
CapabilityShaderLayer = 69,
CapabilityShaderViewportIndex = 70,
+ CapabilityFragmentShadingRateKHR = 4422,
CapabilitySubgroupBallotKHR = 4423,
CapabilityDrawParameters = 4427,
CapabilitySubgroupVoteKHR = 4431,
@@ -900,6 +905,7 @@
CapabilityFragmentMaskAMD = 5010,
CapabilityStencilExportEXT = 5013,
CapabilityImageReadWriteLodAMD = 5015,
+ CapabilityInt64ImageEXT = 5016,
CapabilityShaderClockKHR = 5055,
CapabilitySampleMaskOverrideCoverageNV = 5249,
CapabilityGeometryShaderPassthroughNV = 5251,
@@ -1024,6 +1030,22 @@
RayQueryCandidateIntersectionTypeMax = 0x7fffffff,
};
+enum FragmentShadingRateShift {
+ FragmentShadingRateVertical2PixelsShift = 0,
+ FragmentShadingRateVertical4PixelsShift = 1,
+ FragmentShadingRateHorizontal2PixelsShift = 2,
+ FragmentShadingRateHorizontal4PixelsShift = 3,
+ FragmentShadingRateMax = 0x7fffffff,
+};
+
+enum FragmentShadingRateMask {
+ FragmentShadingRateMaskNone = 0,
+ FragmentShadingRateVertical2PixelsMask = 0x00000001,
+ FragmentShadingRateVertical4PixelsMask = 0x00000002,
+ FragmentShadingRateHorizontal2PixelsMask = 0x00000004,
+ FragmentShadingRateHorizontal4PixelsMask = 0x00000008,
+};
+
enum Op {
OpNop = 0,
OpUndef = 1,
@@ -1369,6 +1391,7 @@
OpPtrEqual = 401,
OpPtrNotEqual = 402,
OpPtrDiff = 403,
+ OpTerminateInvocation = 4416,
OpSubgroupBallotKHR = 4421,
OpSubgroupFirstInvocationKHR = 4422,
OpSubgroupAllKHR = 4428,
@@ -1939,6 +1962,7 @@
case OpPtrEqual: *hasResult = true; *hasResultType = true; break;
case OpPtrNotEqual: *hasResult = true; *hasResultType = true; break;
case OpPtrDiff: *hasResult = true; *hasResultType = true; break;
+ case OpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
case OpSubgroupBallotKHR: *hasResult = true; *hasResultType = true; break;
case OpSubgroupFirstInvocationKHR: *hasResult = true; *hasResultType = true; break;
case OpSubgroupAllKHR: *hasResult = true; *hasResultType = true; break;
@@ -2164,6 +2188,7 @@
inline MemoryAccessMask operator|(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) | unsigned(b)); }
inline KernelProfilingInfoMask operator|(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) | unsigned(b)); }
inline RayFlagsMask operator|(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) | unsigned(b)); }
+inline FragmentShadingRateMask operator|(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) | unsigned(b)); }
} // end namespace spv
diff --git a/Test/baseResults/spv.builtin.PrimitiveShadingRateEXT.vert.out b/Test/baseResults/spv.builtin.PrimitiveShadingRateEXT.vert.out
new file mode 100644
index 0000000..8daa79e
--- /dev/null
+++ b/Test/baseResults/spv.builtin.PrimitiveShadingRateEXT.vert.out
@@ -0,0 +1,53 @@
+spv.builtin.PrimitiveShadingRateEXT.vert
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 26
+
+ Capability Shader
+ Capability FragmentShadingRateKHR
+ Extension "SPV_KHR_fragment_shading_rate"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Vertex 4 "main" 8 16
+ Source GLSL 450
+ SourceExtension "GL_EXT_fragment_shading_rate"
+ Name 4 "main"
+ Name 8 "id"
+ Name 16 "gl_PrimitiveShadingRateEXT"
+ Decorate 8(id) Location 0
+ Decorate 16(gl_PrimitiveShadingRateEXT) BuiltIn PrimitiveShadingRateKHR
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 1
+ 7: TypePointer Input 6(int)
+ 8(id): 7(ptr) Variable Input
+ 15: TypePointer Output 6(int)
+16(gl_PrimitiveShadingRateEXT): 15(ptr) Variable Output
+ 17: 6(int) Constant 5
+ 19: 6(int) Constant 9
+ 21: 6(int) Constant 6
+ 23: 6(int) Constant 10
+ 4(main): 2 Function None 3
+ 5: Label
+ 9: 6(int) Load 8(id)
+ SelectionMerge 14 None
+ Switch 9 14
+ case 0: 10
+ case 1: 11
+ case 2: 12
+ case 3: 13
+ 10: Label
+ Store 16(gl_PrimitiveShadingRateEXT) 17
+ Branch 14
+ 11: Label
+ Store 16(gl_PrimitiveShadingRateEXT) 19
+ Branch 14
+ 12: Label
+ Store 16(gl_PrimitiveShadingRateEXT) 21
+ Branch 14
+ 13: Label
+ Store 16(gl_PrimitiveShadingRateEXT) 23
+ Branch 14
+ 14: Label
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.builtin.ShadingRateEXT.frag.out b/Test/baseResults/spv.builtin.ShadingRateEXT.frag.out
new file mode 100644
index 0000000..95b94d2
--- /dev/null
+++ b/Test/baseResults/spv.builtin.ShadingRateEXT.frag.out
@@ -0,0 +1,36 @@
+spv.builtin.ShadingRateEXT.frag
+WARNING: 0:5: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
+ "precision mediump int; precision highp float;"
+
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 12
+
+ Capability Shader
+ Capability FragmentShadingRateKHR
+ Extension "SPV_KHR_fragment_shading_rate"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Fragment 4 "main" 8 10
+ ExecutionMode 4 OriginUpperLeft
+ Source GLSL 450
+ SourceExtension "GL_EXT_fragment_shading_rate"
+ Name 4 "main"
+ Name 8 "val"
+ Name 10 "gl_ShadingRateEXT"
+ Decorate 8(val) Location 0
+ Decorate 10(gl_ShadingRateEXT) Flat
+ Decorate 10(gl_ShadingRateEXT) BuiltIn ShadingRateKHR
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 1
+ 7: TypePointer Output 6(int)
+ 8(val): 7(ptr) Variable Output
+ 9: TypePointer Input 6(int)
+10(gl_ShadingRateEXT): 9(ptr) Variable Input
+ 4(main): 2 Function None 3
+ 5: Label
+ 11: 6(int) Load 10(gl_ShadingRateEXT)
+ Store 8(val) 11
+ Return
+ FunctionEnd
diff --git a/Test/spv.builtin.PrimitiveShadingRateEXT.vert b/Test/spv.builtin.PrimitiveShadingRateEXT.vert
new file mode 100644
index 0000000..6fd98c3
--- /dev/null
+++ b/Test/spv.builtin.PrimitiveShadingRateEXT.vert
@@ -0,0 +1,28 @@
+#version 450
+
+#extension GL_EXT_fragment_shading_rate : enable
+
+layout(location = 0) in int id;
+
+void main()
+{
+ switch (id)
+ {
+ case 0:
+ // V2 | H2 => 5
+ gl_PrimitiveShadingRateEXT = gl_ShadingRateFlag2VerticalPixelsEXT | gl_ShadingRateFlag2HorizontalPixelsEXT;
+ break;
+ case 1:
+ // V2 | H4 => 9
+ gl_PrimitiveShadingRateEXT = gl_ShadingRateFlag2VerticalPixelsEXT | gl_ShadingRateFlag4HorizontalPixelsEXT;
+ break;
+ case 2:
+ // V4 | H2 => 6
+ gl_PrimitiveShadingRateEXT = gl_ShadingRateFlag4VerticalPixelsEXT | gl_ShadingRateFlag2HorizontalPixelsEXT;
+ break;
+ case 3:
+ // V4 | H4 => 10
+ gl_PrimitiveShadingRateEXT = gl_ShadingRateFlag4VerticalPixelsEXT | gl_ShadingRateFlag4HorizontalPixelsEXT;
+ break;
+ }
+}
\ No newline at end of file
diff --git a/Test/spv.builtin.ShadingRateEXT.frag b/Test/spv.builtin.ShadingRateEXT.frag
new file mode 100644
index 0000000..616baec
--- /dev/null
+++ b/Test/spv.builtin.ShadingRateEXT.frag
@@ -0,0 +1,8 @@
+#version 450
+
+#extension GL_EXT_fragment_shading_rate : enable
+
+out highp int val;
+void main () {
+ val = gl_ShadingRateEXT;
+}
diff --git a/glslang/Include/BaseTypes.h b/glslang/Include/BaseTypes.h
index b69eaeb..55bdd25 100644
--- a/glslang/Include/BaseTypes.h
+++ b/glslang/Include/BaseTypes.h
@@ -228,6 +228,9 @@
EbvViewIndex,
EbvDeviceIndex,
+ EbvShadingRateKHR,
+ EbvPrimitiveShadingRateKHR,
+
EbvFragSizeEXT,
EbvFragInvocationCountEXT,
@@ -480,6 +483,9 @@
case EbvWarpID: return "WarpIDNV";
case EbvSMID: return "SMIDNV";
+ case EbvShadingRateKHR: return "ShadingRateKHR";
+ case EbvPrimitiveShadingRateKHR: return "PrimitiveShadingRateKHR";
+
default: return "unknown built-in variable";
}
}
diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index 8d5d04f..0ce2583 100644
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -4928,6 +4928,11 @@
"\n");
}
+ if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 310)) {
+ stageBuiltins[EShLangVertex].append(
+ "out highp int gl_PrimitiveShadingRateEXT;" // GL_EXT_fragment_shading_rate
+ "\n");
+ }
//============================================================================
//
@@ -5041,6 +5046,12 @@
"\n");
}
+ if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 310)) {
+ stageBuiltins[EShLangGeometry].append(
+ "out highp int gl_PrimitiveShadingRateEXT;" // GL_EXT_fragment_shading_rate
+ "\n");
+ }
+
//============================================================================
//
// Define the interface to the tessellation control shader.
@@ -5338,6 +5349,11 @@
"in vec3 gl_BaryCoordNoPerspNV;"
);
+ if (version >= 450)
+ stageBuiltins[EShLangFragment].append(
+ "flat in int gl_ShadingRateEXT;" // GL_EXT_fragment_shading_rate
+ );
+
} else {
// ES profile
@@ -5396,6 +5412,10 @@
"in vec3 gl_BaryCoordNV;"
"in vec3 gl_BaryCoordNoPerspNV;"
);
+ if (version >= 310)
+ stageBuiltins[EShLangFragment].append(
+ "flat in highp int gl_ShadingRateEXT;" // GL_EXT_fragment_shading_rate
+ );
}
#endif
@@ -5692,6 +5712,18 @@
"flat in highp uint gl_ViewID_OVR;" // GL_OVR_multiview, GL_OVR_multiview2
"\n");
}
+
+ // Adding these to common built-ins triggers an assert due to a memory corruption in related code when testing
+ // So instead add to each stage individually, avoiding the GLSLang bug
+ if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 310)) {
+ for (int stage=EShLangVertex; stage<EShLangCount; stage++)
+ {
+ stageBuiltins[static_cast<EShLanguage>(stage)].append("const highp int gl_ShadingRateFlag2VerticalPixelsEXT = 1;\n");
+ stageBuiltins[static_cast<EShLanguage>(stage)].append("const highp int gl_ShadingRateFlag4VerticalPixelsEXT = 2;\n");
+ stageBuiltins[static_cast<EShLanguage>(stage)].append("const highp int gl_ShadingRateFlag2HorizontalPixelsEXT = 4;\n");
+ stageBuiltins[static_cast<EShLanguage>(stage)].append("const highp int gl_ShadingRateFlag4HorizontalPixelsEXT = 8;\n");
+ }
+ }
#endif // !GLSLANG_WEB
// printf("%s\n", commonBuiltins.c_str());
@@ -7650,6 +7682,20 @@
BuiltInVariable("gl_WarpIDNV", EbvWarpID, symbolTable);
BuiltInVariable("gl_SMIDNV", EbvSMID, symbolTable);
}
+
+ if (language == EShLangGeometry || language == EShLangVertex) {
+ if ((profile == EEsProfile && version >= 310) ||
+ (profile != EEsProfile && version >= 450)) {
+ symbolTable.setVariableExtensions("gl_PrimitiveShadingRateEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ BuiltInVariable("gl_PrimitiveShadingRateEXT", EbvPrimitiveShadingRateKHR, symbolTable);
+
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ }
+ }
+
#endif // !GLSLANG_WEB
break;
@@ -8156,6 +8202,17 @@
}
symbolTable.setFunctionExtensions("helperInvocationEXT", 1, &E_GL_EXT_demote_to_helper_invocation);
+
+ if ((profile == EEsProfile && version >= 310) ||
+ (profile != EEsProfile && version >= 450)) {
+ symbolTable.setVariableExtensions("gl_ShadingRateEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ BuiltInVariable("gl_ShadingRateEXT", EbvShadingRateKHR, symbolTable);
+
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ }
#endif // !GLSLANG_WEB
break;
@@ -8288,6 +8345,14 @@
symbolTable.setFunctionExtensions("dFdyCoarse", 1, &E_GL_NV_compute_shader_derivatives);
symbolTable.setFunctionExtensions("fwidthCoarse", 1, &E_GL_NV_compute_shader_derivatives);
}
+
+ if ((profile == EEsProfile && version >= 310) ||
+ (profile != EEsProfile && version >= 450)) {
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ }
#endif // !GLSLANG_WEB
break;
@@ -8437,6 +8502,13 @@
BuiltInVariable("gl_WarpIDNV", EbvWarpID, symbolTable);
BuiltInVariable("gl_SMIDNV", EbvSMID, symbolTable);
}
+ if ((profile == EEsProfile && version >= 310) ||
+ (profile != EEsProfile && version >= 450)) {
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ }
break;
case EShLangMeshNV:
@@ -8581,6 +8653,14 @@
BuiltInVariable("gl_WarpIDNV", EbvWarpID, symbolTable);
BuiltInVariable("gl_SMIDNV", EbvSMID, symbolTable);
}
+
+ if ((profile == EEsProfile && version >= 310) ||
+ (profile != EEsProfile && version >= 450)) {
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ }
break;
case EShLangTaskNV:
@@ -8681,6 +8761,13 @@
BuiltInVariable("gl_WarpIDNV", EbvWarpID, symbolTable);
BuiltInVariable("gl_SMIDNV", EbvSMID, symbolTable);
}
+ if ((profile == EEsProfile && version >= 310) ||
+ (profile != EEsProfile && version >= 450)) {
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag2HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ symbolTable.setVariableExtensions("gl_ShadingRateFlag4HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+ }
break;
#endif
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index 86a5a37..b9b37fb 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -4226,6 +4226,8 @@
(identifier == "gl_FragCoord" && ((nonEsRedecls && version >= 150) || esRedecls)) ||
identifier == "gl_ClipDistance" ||
identifier == "gl_CullDistance" ||
+ identifier == "gl_ShadingRateEXT" ||
+ identifier == "gl_PrimitiveShadingRateEXT" ||
identifier == "gl_FrontColor" ||
identifier == "gl_BackColor" ||
identifier == "gl_FrontSecondaryColor" ||
diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp
index 896fd5a..92d8d80 100644
--- a/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@ -327,6 +327,7 @@
extensionBehavior[E_GL_EXT_ray_flags_primitive_culling] = EBhDisable;
extensionBehavior[E_GL_EXT_blend_func_extended] = EBhDisable;
extensionBehavior[E_GL_EXT_shader_implicit_conversions] = EBhDisable;
+ extensionBehavior[E_GL_EXT_fragment_shading_rate] = EBhDisable;
// OVR extensions
extensionBehavior[E_GL_OVR_multiview] = EBhDisable;
@@ -371,6 +372,7 @@
"#define GL_EXT_YUV_target 1\n"
"#define GL_EXT_shader_texture_lod 1\n"
"#define GL_EXT_shadow_samplers 1\n"
+ "#define GL_EXT_fragment_shading_rate 1\n"
// AEP
"#define GL_ANDROID_extension_pack_es31a 1\n"
@@ -463,6 +465,7 @@
"#define GL_EXT_buffer_reference_uvec2 1\n"
"#define GL_EXT_demote_to_helper_invocation 1\n"
"#define GL_EXT_debug_printf 1\n"
+ "#define GL_EXT_fragment_shading_rate 1\n"
// GL_KHR_shader_subgroup
"#define GL_KHR_shader_subgroup_basic 1\n"
diff --git a/glslang/MachineIndependent/Versions.h b/glslang/MachineIndependent/Versions.h
index f52f605..7c38de3 100644
--- a/glslang/MachineIndependent/Versions.h
+++ b/glslang/MachineIndependent/Versions.h
@@ -199,6 +199,7 @@
const char* const E_GL_EXT_ray_flags_primitive_culling = "GL_EXT_ray_flags_primitive_culling";
const char* const E_GL_EXT_blend_func_extended = "GL_EXT_blend_func_extended";
const char* const E_GL_EXT_shader_implicit_conversions = "GL_EXT_shader_implicit_conversions";
+const char* const E_GL_EXT_fragment_shading_rate = "GL_EXT_fragment_shading_rate";
// Arrays of extensions for the above viewportEXTs duplications
diff --git a/gtests/Spv.FromFile.cpp b/gtests/Spv.FromFile.cpp
index df68f52..c078156 100644
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -446,6 +446,8 @@
"spv.samplerlessTextureFunctions.frag",
"spv.smBuiltins.vert",
"spv.smBuiltins.frag",
+ "spv.builtin.PrimitiveShadingRateEXT.vert",
+ "spv.builtin.ShadingRateEXT.frag",
})),
FileNameAsCustomTestSuffix
);
diff --git a/known_good.json b/known_good.json
index 289b384..1ee683d 100644
--- a/known_good.json
+++ b/known_good.json
@@ -5,14 +5,14 @@
"site" : "github",
"subrepo" : "KhronosGroup/SPIRV-Tools",
"subdir" : "External/spirv-tools",
- "commit" : "0a1fb588cd365f7737cb121fdd64553923e0cef6"
+ "commit" : "a1d38174b1f7d2651c718ae661886d606cb50a32"
},
{
"name" : "spirv-tools/external/spirv-headers",
"site" : "github",
"subrepo" : "KhronosGroup/SPIRV-Headers",
"subdir" : "External/spirv-tools/external/spirv-headers",
- "commit" : "060627f0b0d2fa8581b5acb939f46e3b9e500593"
+ "commit" : "05836bdba63e7debce9fa9feaed42f20cd43af9d"
}
]
}
