Апдейт шейдеров [skip ci]

Author: xrSimpodin

Game/Resources_SoC_1.0006/gamedata/shaders/r3/Gauss.h

@@ -1,8 +1,6 @@
 #ifndef GAUSSBLUR_H_INCLUDED
 #define GAUSSBLUR_H_INCLUDED
 
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
-
 float4 Gauss(Texture2D t2d, float2 texCoord, int factor, bool optimize)
 {
     float4 outColor = 0.f;

Game/Resources_SoC_1.0006/gamedata/shaders/r3/accum_sun_near_old.ps

@@ -10,7 +10,6 @@
 #include "common_cbuffers.h"
 #include "common_functions.h"
 
-// #define USE_SUPER_SPECULAR
 #define USE_SUNMASK
 
 #ifdef USE_R2_STATIC_SUN
@@ -29,7 +28,6 @@
 // #define DBG_TEST_LIGHT
 // #define DBG_TEST_LIGHT_SPEC
 
-// #define USE_GAMMA_22
 // #define USE_SJITTER
 // #define USE_SUNFILTER
 // #define USE_FETCH4
@@ -48,7 +46,6 @@
 // #define USE_LM_HEMI                	//- shader defined
 // #define USE_DISTORT                	//- shader defined
 // #define USE_SUNMASK                		//- shader defined
-// #define DBG_TMAPPING
 //////////////////////////////////////////////////////////////////////////////////////////
 
 uniform float4                J_direct        [6];

Game/Resources_SoC_1.0006/gamedata/shaders/r3/accum_volumetric_sun.ps

@@ -91,50 +91,20 @@ float3 calc_reflection(float3 pos_w, float3 norm_w) { return reflect(normalize(p
 #define USABLE_BIT_15 uint(0x80000000)
 #define MUST_BE_SET uint(0x40000000) // This flag *must* be stored in the floating-point representation of the bit flag to store
 
-/*
-float2 gbuf_pack_normal( float3 norm )
+// RainbowZerg: use spheremap transform (Crytek's implementation) for normals packing
+float2 gbuf_pack_normal(float3 N)
 {
-   float2 res;
-
-   res = 0.5 * ( norm.xy + float2( 1, 1 ) ) ;
-   res.x *= ( norm.z < 0 ? -1.0 : 1.0 );
-
-   return res;
-}
-
-float3 gbuf_unpack_normal( float2 norm )
-{
-   float3 res;
-
-   res.xy = ( 2.0 * abs( norm ) ) - float2(1,1);
-
-   res.z = ( norm.x < 0 ? -1.0 : 1.0 ) * sqrt( abs( 1 - res.x * res.x - res.y * res.y ) );
-
-   return res;
+    return normalize(N.xy) * sqrt(N.z * 0.5 + 0.5);
+    ;
 }
-*/
 
-// Holger Gruen AMD - I change normal packing and unpacking to make sure N.z is accessible without ALU cost
-// this help the HDAO compute shader to run more efficiently
-float2 gbuf_pack_normal(float3 norm)
-{
-    float2 res;
-
-    res.x = norm.z;
-    res.y = 0.5f * (norm.x + 1.0f);
-    res.y *= (norm.y < 0.0f ? -1.0f : 1.0f);
-
-    return res;
-}
-
-float3 gbuf_unpack_normal(float2 norm)
+float3 gbuf_unpack_normal(float2 enc)
 {
+    // Spheremap transform
     float3 res;
-
-    res.z = norm.x;
-    res.x = (2.0f * abs(norm.y)) - 1.0f;
-    res.y = (norm.y < 0 ? -1.0 : 1.0) * sqrt(abs(1 - res.x * res.x - res.z * res.z));
-
+    float l = length(enc.xy);
+    res.z = l * l * 2.0 - 1.0;
+    res.xy = normalize(enc.xy) * sqrt(1.0 - res.z * res.z);
     return res;
 }
 

Game/Resources_SoC_1.0006/gamedata/shaders/r3/combine_1.ps

@@ -26,7 +26,7 @@ function normal                (shader, t_base, t_second, t_detail)
 	shader:dx10texture	("s_env0",		tex_env0)
 	shader:dx10texture	("s_env1",		tex_env1)
 	shader:dx10texture	("s_position",	"$user$position")
-	shader:dx10texture	("s_image", "$user$generic0_temp")
+	shader:dx10texture	("s_last_frame", "$user$generic0_temp")
 	shader:dx10texture	("s_leaves",	tex_leaves)
 
 	shader:dx10sampler	("smp_base")

Game/Resources_SoC_1.0006/gamedata/shaders/r3/common.h

@@ -26,7 +26,7 @@ function normal                (shader, t_base, t_second, t_detail)
 	shader:dx10texture	("s_env0",		tex_env0)
 	shader:dx10texture	("s_env1",		tex_env1)
 	shader:dx10texture	("s_position",	"$user$position")
-	shader:dx10texture	("s_image", "$user$generic0_temp")
+	shader:dx10texture	("s_last_frame", "$user$generic0_temp")
 	shader:dx10texture	("s_leaves",	tex_leaves)
 
 	shader:dx10sampler	("smp_base")

Game/Resources_SoC_1.0006/gamedata/shaders/r3/common_functions.h

@@ -26,7 +26,7 @@ function normal                (shader, t_base, t_second, t_detail)
 	shader:dx10texture	("s_env0",		tex_env0)
 	shader:dx10texture	("s_env1",		tex_env1)
 	shader:dx10texture	("s_position",	"$user$position")
-	shader:dx10texture	("s_image", "$user$generic0_temp")
+	shader:dx10texture	("s_last_frame", "$user$generic0_temp")
 	shader:dx10texture	("s_leaves",	tex_leaves)
 
 	shader:dx10sampler	("smp_base")

Game/Resources_SoC_1.0006/gamedata/shaders/r3/effects_water.s

@@ -1,7 +1,4 @@
-#include "common_iostructs.h"
-//#include "common.h"
-
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex