Upgraded to latest SPIR-V Cross and removed AMD broken GPU driver row_major workaround (since now that's included in SPIR-V Cross codebase, "lol AMD sux")

Author: devshgraphicsprogramming

3rdparty/spirv_cross

@@ -26,13 +26,9 @@ struct VertexStruct
 const char* vertexSource = R"===(
 #version 430 core
 
-#include "irr/builtin/glsl/broken_driver_workarounds/amd.glsl"
-
 layout(location = 0) in vec4 vPos; //only a 3d position is passed from irrlicht, but last (the W) coordinate gets filled with default 1.0
 layout(location = 1) in vec4 vCol;
 
-#include <irr/builtin/glsl/broken_driver_workarounds/amd.glsl>
-
 layout( push_constant, row_major ) uniform Block {
 	mat4 modelViewProj;
 } PushConstants;
@@ -41,7 +37,7 @@ layout(location = 0) out vec4 Color; //per vertex output color, will be interpol
 
 void main()
 {
-    gl_Position = irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(PushConstants.modelViewProj)*vPos; //only thing preventing the shader from being core-compliant
+    gl_Position = PushConstants.modelViewProj*vPos; //only thing preventing the shader from being core-compliant
     Color = vCol;
 }
 )===";

examples_tests/03.GPU_Mesh/main.cpp

@@ -30,7 +30,7 @@ void main()
     if (drawID>=pc.data.maxDrawCount)
         return;
 
-    mat4x3 worldMatrix = irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(modelData[drawID].worldMatrix);
+    mat4x3 worldMatrix = modelData[drawID].worldMatrix;
     mat4 MVP = irr_glsl_pseudoMul4x4with4x3(pc.data.viewProjMatrix,worldMatrix);
 
     bool notCulled = true;
@@ -46,6 +46,6 @@ void main()
     if (notCulled)
     {
         drawData[drawID].modelViewProjMatrix = MVP;
-        drawData[drawID].normalMatrix = pc.data.viewInverseTransposeMatrix*irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(modelData[drawID].normalMatrix);
+        drawData[drawID].normalMatrix = pc.data.viewInverseTransposeMatrix*modelData[drawID].normalMatrix;
     }
 }

examples_tests/26.MultidrawIndirectVSCPUCull/boxFrustCull.comp

@@ -12,9 +12,9 @@ layout(location = 1) flat out vec3 Normal;
 
 void impl(uint _objectUUID)
 {
-	mat4 mvp = irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(drawData[_objectUUID].modelViewProjMatrix);
+	mat4 mvp = drawData[_objectUUID].modelViewProjMatrix;
 
     gl_Position = mvp[0]*vPos.x+mvp[1]*vPos.y+mvp[2]*vPos.z+mvp[3];
     Color = vec4(0.4,0.4,1.0,1.0);
-    Normal = normalize(irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(drawData[_objectUUID].normalMatrix)*vNormal); //have to normalize twice because of normal quantization
+    Normal = normalize(drawData[_objectUUID].normalMatrix*vNormal); //have to normalize twice because of normal quantization
 }

examples_tests/26.MultidrawIndirectVSCPUCull/commonVertexShader.glsl

@@ -12,5 +12,5 @@ layout (set = 0, binding = 0, row_major, std140) uniform UBO
 
 void main()
 {
-	gl_Position = irr_glsl_pseudoMul4x4with3x1(irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(CamData.params.MVP), vPos);
+	gl_Position = irr_glsl_pseudoMul4x4with3x1(CamData.params.MVP, vPos);
 }

examples_tests/29.SpecializationConstants/particles.vert

@@ -45,7 +45,6 @@ layout(location = 3) in vec3 vNormal;
 
 #include <irr/builtin/glsl/utils/common.glsl>
 #include <irr/builtin/glsl/utils/transform.glsl>
-#include <irr/builtin/glsl/broken_driver_workarounds/amd.glsl>
 
 layout( push_constant, row_major ) uniform Block {
 	mat4 modelViewProj;
@@ -55,7 +54,7 @@ layout(location = 0) out vec3 Color; //per vertex output color, will be interpol
 
 void main()
 {
-    gl_Position = irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(PushConstants.modelViewProj)*vPos;
+    gl_Position = PushConstants.modelViewProj*vPos;
     Color = vNormal*0.5+vec3(0.5);
 }
 )===";

examples_tests/35.GeometryCreator/main.cpp

@@ -437,7 +437,7 @@ void main()
     const vec2 pixOffsetParam = vec2(1.0)/vec2(textureSize(scramblebuf,0));
 
 
-    const mat4 invMVP = inverse(irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(cameraData.params.MVP));
+    const mat4 invMVP = inverse(cameraData.params.MVP);
 
     vec4 NDC = vec4(TexCoord*vec2(2.0,-2.0)+vec2(-1.0,1.0),0.0,1.0);
     vec3 camPos;

examples_tests/42.FragmentShaderPathTracer/common.glsl

@@ -1,6 +1,8 @@
 #ifndef _IRR_MATH_TYPELESS_ARITHMETIC_INCLUDED_
 #define _IRR_MATH_TYPELESS_ARITHMETIC_INCLUDED_
 
+// TODO: change header name to binary_operator_functions.glsl
+
 uint irr_glsl_identityFunction(in uint x) {return x;}
 
 uint irr_glsl_and(in uint x, in uint y) {return x&y;}
@@ -12,16 +14,8 @@ uint irr_glsl_or(in uint x, in uint y) {return x|y;}
 
 uint irr_glsl_add(in uint x, in uint y) {return x+y;}
 float irr_glsl_add(in float x, in float y) {return x+y;}
-uint irr_glsl_addAsFloat(in uint x, in uint y) {return floatBitsToUint(uintBitsToFloat(x)+uintBitsToFloat(y));}
 
 uint irr_glsl_mul(in uint x, in uint y) {return x*y;}
 float irr_glsl_mul(in float x, in float y) {return x*y;}
-uint irr_glsl_mulAsFloat(in uint x, in uint y) {return floatBitsToUint(uintBitsToFloat(x)*uintBitsToFloat(y));}
-
-uint irr_glsl_minAsInt(in uint x, in uint y) {return min(int(x),int(y));}
-uint irr_glsl_minAsFloat(in uint x, in uint y) {return floatBitsToUint(min(uintBitsToFloat(x),uintBitsToFloat(y)));}
-
-uint irr_glsl_maxAsInt(in uint x, in uint y) {return max(int(x),int(y));}
-uint irr_glsl_maxAsFloat(in uint x, in uint y) {return floatBitsToUint(max(uintBitsToFloat(x),uintBitsToFloat(y)));}
 
 #endif

include/irr/builtin/glsl/broken_driver_workarounds/amd.glsl

@@ -1,8 +1,6 @@
 #ifndef _IRR_BUILTIN_GLSL_UTILS_COMMON_INCLUDED_
 #define _IRR_BUILTIN_GLSL_UTILS_COMMON_INCLUDED_
 
-#include "irr/builtin/glsl/broken_driver_workarounds/amd.glsl"
-
 #include "irr/builtin/glsl/math/functions.glsl"
 
 
@@ -15,11 +13,11 @@ struct irr_glsl_SBasicViewParameters
 
 mat3 irr_glsl_SBasicViewParameters_GetNormalMat(in mat4x3 _NormalMatAndEyePos)
 {
-    return mat3(irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(_NormalMatAndEyePos));
+    return mat3(_NormalMatAndEyePos);
 }
 vec3 irr_glsl_SBasicViewParameters_GetEyePos(in mat4x3 _NormalMatAndEyePos)
 {
-    return irr_builtin_glsl_workaround_AMD_broken_row_major_qualifier(_NormalMatAndEyePos)[3];
+    return _NormalMatAndEyePos[3];
 }
 
 #endif