Use correct nonuniformEXT with sampler2D.

Used to crash some drivers, but should be fine now ...
tommo · Dec 3, 2020 · 8e1c9fe · 8e1c9fe
1 parent 902cad1
commit 8e1c9fe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/assets/shaders/lights/pcf.h b/assets/shaders/lights/pcf.h
@@ -10,7 +10,7 @@ layout(set = 1, binding = 15) uniform sampler LinearShadowSampler;
 #endif
 
 #define SAMPLE_PCF_BINDLESS(tex, index, uv, x, y) \
-	textureLodOffset(sampler2DShadow(tex[nonuniformEXT(index)], LinearShadowSampler), uv, 0.0, ivec2(x, y))
+	textureLodOffset(nonuniformEXT(sampler2DShadow(tex[index], LinearShadowSampler)), uv, 0.0, ivec2(x, y))
 #define SAMPLE_PCF(tex, uv, x, y) \
 	textureLodOffset(tex, uv, 0.0, ivec2(x, y))
 #define SAMPLE_PCF_LAYER(tex, uvz, x, y) \
@@ -172,7 +172,7 @@ layout(set = 1, binding = 15) uniform sampler LinearShadowSampler;
 	var += 0.0625 * SAMPLE_PCF_LAYER(tex, clip_uv, +1, +1); \
 }
 #elif SHADOW_MAP_PCF_KERNEL_WIDTH == 1
-#define SAMPLE_PCF_KERNEL_BINDLESS(var, tex, index, uv) var = textureProjLod(sampler2DShadow(tex[nonuniformEXT(index)], LinearShadowSampler), uv, 0.0)
+#define SAMPLE_PCF_KERNEL_BINDLESS(var, tex, index, uv) var = textureProjLod(nonuniformEXT(sampler2DShadow(tex[index], LinearShadowSampler)), uv, 0.0)
 #define SAMPLE_PCF_KERNEL(var, tex, uv) var = textureProjLod(tex, uv, 0.0)
 #define SAMPLE_PCF_KERNEL_LAYER_NOPROJ(var, tex, uv, layer) var = SAMPLE_PCF_LAYER_NO_OFFSET(tex, vec4((uv).xy, layer, (uv).z))
 #else

diff --git a/assets/shaders/lights/point.h b/assets/shaders/lights/point.h
@@ -93,12 +93,12 @@ mediump vec3 compute_point_color(int index, vec3 world_pos, out mediump vec3 lig
 		#endif
 	#else
 		#ifdef POSITIONAL_SHADOW_VSM
-			vec2 shadow_moments = textureLod(samplerCube(uPointShadowAtlas[nonuniformEXT(index)], LinearClampSampler), light_dir_full, 0.0).xy;
+			vec2 shadow_moments = textureLod(nonuniformEXT(samplerCube(uPointShadowAtlas[index], LinearClampSampler)), light_dir_full, 0.0).xy;
 			mediump float shadow_falloff = vsm(max_z, shadow_moments);
 		#else
 			vec2 shadow_ref2 = shadow_transform.zw - shadow_transform.xy * max_z;
 			float shadow_ref = shadow_ref2.x / shadow_ref2.y;
-			mediump float shadow_falloff = texture(samplerCubeShadow(uPointShadowAtlas[nonuniformEXT(index)], LinearShadowSampler), vec4(light_dir_full, shadow_ref));
+			mediump float shadow_falloff = texture(nonuniformEXT(samplerCubeShadow(uPointShadowAtlas[index], LinearShadowSampler)), vec4(light_dir_full, shadow_ref));
 		#endif
 	#endif
 #else

diff --git a/assets/shaders/lights/spot.h b/assets/shaders/lights/spot.h
@@ -84,7 +84,7 @@ mediump vec3 compute_spot_color(int index, vec3 world_pos, out mediump vec3 ligh
 		vec4 spot_shadow_clip = SPOT_SHADOW_TRANSFORM(index) * vec4(world_pos, 1.0);
 		vec2 shadow_uv = spot_shadow_clip.xy / spot_shadow_clip.w;
 		#ifdef CLUSTERER_BINDLESS
-			vec2 shadow_moments = textureLod(sampler2D(uSpotShadowAtlas[nonuniformEXT(index)], LinearClampSampler), shadow_uv, 0.0).xy;
+			vec2 shadow_moments = textureLod(nonuniformEXT(sampler2D(uSpotShadowAtlas[index], LinearClampSampler)), shadow_uv, 0.0).xy;
 		#else
 			vec2 shadow_moments = textureLod(uSpotShadowAtlas, shadow_uv, 0.0).xy;
 		#endif

diff --git a/tests/assets/shaders/bindless.frag b/tests/assets/shaders/bindless.frag
@@ -14,6 +14,6 @@ void main()
     int index = x ^ y;
 
     FragColor =
-        textureLod(sampler2D(uImages[nonuniformEXT(index)], uSampler), vec2(0.5), 0.0) *
-        textureLod(sampler2D(uImages2[nonuniformEXT(index)], uSampler), vec2(0.5), 0.0);
-}
+        textureLod(nonuniformEXT(sampler2D(uImages[index], uSampler)), vec2(0.5), 0.0) *
+        textureLod(nonuniformEXT(sampler2D(uImages2[index], uSampler)), vec2(0.5), 0.0);
+}