diff --git a/res/gamedata/shaders/gl/combine_1.ps b/res/gamedata/shaders/gl/combine_1.ps index 89731dbea52..51e16a192d3 100644 Binary files a/res/gamedata/shaders/gl/combine_1.ps and b/res/gamedata/shaders/gl/combine_1.ps differ diff --git a/res/gamedata/shaders/gl/combine_1.vs b/res/gamedata/shaders/gl/combine_1.vs index 26833215ab9..610c6d705e5 100644 --- a/res/gamedata/shaders/gl/combine_1.vs +++ b/res/gamedata/shaders/gl/combine_1.vs @@ -1,6 +1,6 @@ #include "common.h" #include "iostructs\v_combine.h" -#line 4 2 + ////////////////////////////////////////////////////////////////////////////////////////// // Vertex v2p _main ( _in I ) diff --git a/res/gamedata/shaders/gl/combine_2_aa.ps b/res/gamedata/shaders/gl/combine_2_aa.ps index 9ef4c010801..9a335420784 100644 Binary files a/res/gamedata/shaders/gl/combine_2_aa.ps and b/res/gamedata/shaders/gl/combine_2_aa.ps differ diff --git a/res/gamedata/shaders/gl/combine_2_naa.ps b/res/gamedata/shaders/gl/combine_2_naa.ps index 56d9896065c..b416aa4d2ae 100644 Binary files a/res/gamedata/shaders/gl/combine_2_naa.ps and b/res/gamedata/shaders/gl/combine_2_naa.ps differ diff --git a/res/gamedata/shaders/gl/combine_volumetric.ps b/res/gamedata/shaders/gl/combine_volumetric.ps index c90008326e5..a5dc80eadbc 100644 Binary files a/res/gamedata/shaders/gl/combine_volumetric.ps and b/res/gamedata/shaders/gl/combine_volumetric.ps differ diff --git a/res/gamedata/shaders/gl/hmodel.h b/res/gamedata/shaders/gl/hmodel.h index 6f24ee95509..3851fcc6be5 100644 --- a/res/gamedata/shaders/gl/hmodel.h +++ b/res/gamedata/shaders/gl/hmodel.h @@ -2,7 +2,7 @@ #define HMODEL_H #include "common.h" -#line 6 8 + //uniform samplerCUBE env_s0 ; //uniform samplerCUBE env_s1 ; //uniform samplerCUBE sky_s0 ; diff --git a/res/gamedata/shaders/gl/iostructs/p_combine.h b/res/gamedata/shaders/gl/iostructs/p_combine.h index d44a6e6a649..b2c89e81f0f 100644 --- a/res/gamedata/shaders/gl/iostructs/p_combine.h +++ b/res/gamedata/shaders/gl/iostructs/p_combine.h @@ -5,7 +5,7 @@ in vec4 gl_FragCoord; #ifdef MSAA_OPTIMIZATION in int gl_SampleID; #endif -#line 9 10 + struct _input { float4 tc0 ; // TEXCOORD0; // tc.xy, tc.w = tonemap scale diff --git a/res/gamedata/shaders/gl/iostructs/v_combine.h b/res/gamedata/shaders/gl/iostructs/v_combine.h index 4d6eb02f224..a856f24a0e1 100644 --- a/res/gamedata/shaders/gl/iostructs/v_combine.h +++ b/res/gamedata/shaders/gl/iostructs/v_combine.h @@ -1,6 +1,6 @@ out gl_PerVertex { vec4 gl_Position; }; -#line 4 1 + struct _in { float4 P ; // POSITIONT; // xy=pos, zw=tc0 diff --git a/res/gamedata/shaders/gl/lmodel.h b/res/gamedata/shaders/gl/lmodel.h index ca1c0b49bc1..645121ace35 100644 --- a/res/gamedata/shaders/gl/lmodel.h +++ b/res/gamedata/shaders/gl/lmodel.h @@ -2,7 +2,7 @@ #define LMODEL_H #include "common.h" -#line 6 9 + ////////////////////////////////////////////////////////////////////////////////////////// // Lighting formulas // float4 plight_infinity( float m, float3 pnt, float3 normal, float3 light_direction ) diff --git a/res/gamedata/shaders/gl/ssao.ps b/res/gamedata/shaders/gl/ssao.ps index 5301bc3c36b..59a7ec310af 100644 Binary files a/res/gamedata/shaders/gl/ssao.ps and b/res/gamedata/shaders/gl/ssao.ps differ diff --git a/res/gamedata/shaders/gl/ssao_blur.ps b/res/gamedata/shaders/gl/ssao_blur.ps index c263eb3b274..470293d2b25 100644 Binary files a/res/gamedata/shaders/gl/ssao_blur.ps and b/res/gamedata/shaders/gl/ssao_blur.ps differ diff --git a/res/gamedata/shaders/gl/ssao_calc.ps b/res/gamedata/shaders/gl/ssao_calc.ps index d596ba431ca..bde54946d19 100644 Binary files a/res/gamedata/shaders/gl/ssao_calc.ps and b/res/gamedata/shaders/gl/ssao_calc.ps differ diff --git a/res/gamedata/shaders/gl/ssao_hbao.ps b/res/gamedata/shaders/gl/ssao_hbao.ps index 5ac0d26ccec..b0a2cf763ff 100644 Binary files a/res/gamedata/shaders/gl/ssao_hbao.ps and b/res/gamedata/shaders/gl/ssao_hbao.ps differ diff --git a/res/gamedata/shaders/gl/ssao_hdao.ps b/res/gamedata/shaders/gl/ssao_hdao.ps index 89a7895e2cf..c0b91243ae3 100644 Binary files a/res/gamedata/shaders/gl/ssao_hdao.ps and b/res/gamedata/shaders/gl/ssao_hdao.ps differ diff --git a/res/gamedata/shaders/gl/ssao_hdao_new.ps b/res/gamedata/shaders/gl/ssao_hdao_new.ps index 97c0cdf2c9e..a769daa556a 100644 Binary files a/res/gamedata/shaders/gl/ssao_hdao_new.ps and b/res/gamedata/shaders/gl/ssao_hdao_new.ps differ