GLSL shaders fixes

MSAA and HBAO is broken And level fog is... yellow
OpenXRay · Feb 4, 2018 · 43445e5 · 43445e5
1 parent 137605d
commit 43445e5
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 7 deletions.
diff --git a/res/gamedata/shaders/gl/combine_1.ps b/res/gamedata/shaders/gl/combine_1.ps
diff --git a/res/gamedata/shaders/gl/combine_2_naa.ps b/res/gamedata/shaders/gl/combine_2_naa.ps
diff --git a/res/gamedata/shaders/gl/combine_volumetric.ps b/res/gamedata/shaders/gl/combine_volumetric.ps
diff --git a/res/gamedata/shaders/gl/common_functions.h b/res/gamedata/shaders/gl/common_functions.h
@@ -239,7 +239,7 @@ gbuffer_data gbuffer_load_data( float2 tc, float4 pos2d, uint iSample )
 #ifndef USE_MSAA
 	float4 P	= tex2D( s_position, tc );
 #else
-	float4 P	= texelFetch( s_position, int2( pos2d ), 0, iSample );
+	float4 P	= texelFetch( s_position, int2( pos2d ), int(iSample) );
 #endif
 
 	// 3d view space pos reconstruction math
@@ -264,7 +264,7 @@ gbuffer_data gbuffer_load_data( float2 tc, float4 pos2d, uint iSample )
 #ifndef USE_MSAA
    float4	C	= tex2D( s_diffuse, tc );
 #else
-   float4	C	= texelFetch( s_diffuse, int2( pos2d ), 0, iSample );
+   float4	C	= texelFetch( s_diffuse, int2( pos2d ), int(iSample) );
 #endif
 
 	gbd.C		= C.xyz;
@@ -300,7 +300,7 @@ gbuffer_data gbuffer_load_data( float2 tc, uint iSample )
 #ifndef USE_MSAA
 	float4 P	= tex2D( s_position, tc );
 #else
-   float4 P		= texelFetch( s_position, int2( tc * pos_decompression_params2.xy ), 0, iSample );
+   float4 P		= texelFetch( s_position, int2( tc * pos_decompression_params2.xy ), int(iSample) );
 #endif
 
 	gbd.P		= P.xyz;
@@ -309,7 +309,7 @@ gbuffer_data gbuffer_load_data( float2 tc, uint iSample )
 #ifndef USE_MSAA
 	float4 N	= tex2D( s_normal, tc );
 #else
-	float4 N	= texelFetch( s_normal, int2( tc * pos_decompression_params2.xy ), 0, iSample );
+	float4 N	= texelFetch( s_normal, int2( tc * pos_decompression_params2.xy ), int(iSample) );
 #endif
 
 	gbd.N		= N.xyz;
@@ -318,7 +318,7 @@ gbuffer_data gbuffer_load_data( float2 tc, uint iSample )
 #ifndef USE_MSAA
 	float4	C	= tex2D( s_diffuse, tc );
 #else
-	float4	C	= texelFetch( s_diffuse, int2( tc * pos_decompression_params2.xy ), 0, iSample );
+	float4	C	= texelFetch( s_diffuse, int2( tc * pos_decompression_params2.xy ), int(iSample) );
 #endif
 
 

diff --git a/res/gamedata/shaders/gl/copy.ps b/res/gamedata/shaders/gl/copy.ps
diff --git a/res/gamedata/shaders/gl/copy_p.ps b/res/gamedata/shaders/gl/copy_p.ps
diff --git a/res/gamedata/shaders/gl/dof.h b/res/gamedata/shaders/gl/dof.h
@@ -39,7 +39,7 @@ float3	dof(float2 center)
 #ifndef USE_MSAA
 	float 	depth		= tex2D(s_position,center).z;
 #else
-	float 	depth		= texelFetch(s_position, int2( center * pos_decompression_params2.xy ), 0, 0).z;
+	float 	depth		= texelFetch(s_position, int2( center * pos_decompression_params2.xy ), 0).z;
 #endif
 	if (depth <= EPSDEPTHDOF)	depth = dof_params.w;
 	float	blur 		= DOFFactor(depth);
@@ -79,7 +79,7 @@ float3	dof(float2 center)
 #ifndef USE_MSAA
 		float 	tap_depth 	= tex2D	(s_position,tap).z;
 #else
-		float 	tap_depth 	= texelFetch(s_position, int2( tap* pos_decompression_params2.xy ), 0, 0).z;
+		float 	tap_depth 	= texelFetch(s_position, int2( tap* pos_decompression_params2.xy ), 0).z;
 #endif
 		if (tap_depth <= EPSDEPTHDOF)	tap_depth = dof_params.w;
 		float 	tap_contrib	= DOFFactor(tap_depth);

diff --git a/res/gamedata/shaders/gl/rain_apply_gloss.ps b/res/gamedata/shaders/gl/rain_apply_gloss.ps
diff --git a/res/gamedata/shaders/gl/rain_apply_normal.ps b/res/gamedata/shaders/gl/rain_apply_normal.ps
diff --git a/res/gamedata/shaders/gl/ssao.ps b/res/gamedata/shaders/gl/ssao.ps
diff --git a/res/gamedata/shaders/gl/ssao_blur.ps b/res/gamedata/shaders/gl/ssao_blur.ps
diff --git a/res/gamedata/shaders/gl/ssao_calc.ps b/res/gamedata/shaders/gl/ssao_calc.ps
diff --git a/res/gamedata/shaders/gl/ssao_hbao.ps b/res/gamedata/shaders/gl/ssao_hbao.ps
diff --git a/res/gamedata/shaders/gl/ssao_hdao.ps b/res/gamedata/shaders/gl/ssao_hdao.ps
diff --git a/res/gamedata/shaders/gl/ssao_hdao_new.ps b/res/gamedata/shaders/gl/ssao_hdao_new.ps