From 63a089ccefd677d9a9a868ed20d4d2862a9db3da Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Thu, 24 Mar 2016 18:58:40 +0100 Subject: [PATCH] shaders: Switch to floating point texture coordinates in detail shaders. --- res/gamedata/shaders/gl/common_iostructs.h | 2 +- res/gamedata/shaders/gl/deffer_detail_s_flat.vs | 2 +- res/gamedata/shaders/gl/deffer_detail_w_flat.vs | 2 +- res/gamedata/shaders/gl/iostructs/v_detail.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/gamedata/shaders/gl/common_iostructs.h b/res/gamedata/shaders/gl/common_iostructs.h index b036091d12d..e9f84a1e076 100644 --- a/res/gamedata/shaders/gl/common_iostructs.h +++ b/res/gamedata/shaders/gl/common_iostructs.h @@ -465,7 +465,7 @@ struct v_tree struct v_detail { float4 pos ; // POSITION; // (float,float,float,1) - int4 misc ; // TEXCOORD0; // (u(Q),v(Q),frac,matrix-id) + float4 misc ; // TEXCOORD0; // (u(Q),v(Q),frac,matrix-id) }; #endif // common_iostructs_h_included \ No newline at end of file diff --git a/res/gamedata/shaders/gl/deffer_detail_s_flat.vs b/res/gamedata/shaders/gl/deffer_detail_s_flat.vs index 07ded42826d..c0c38e4b367 100644 --- a/res/gamedata/shaders/gl/deffer_detail_s_flat.vs +++ b/res/gamedata/shaders/gl/deffer_detail_s_flat.vs @@ -12,7 +12,7 @@ v2p_flat _main (v_detail v) { v2p_flat O; // index - int i = v.misc.w; + int i = int(v.misc.w); float4 m0 = array[i+0]; float4 m1 = array[i+1]; float4 m2 = array[i+2]; diff --git a/res/gamedata/shaders/gl/deffer_detail_w_flat.vs b/res/gamedata/shaders/gl/deffer_detail_w_flat.vs index 4cad0557e19..dfd18cad95a 100644 --- a/res/gamedata/shaders/gl/deffer_detail_w_flat.vs +++ b/res/gamedata/shaders/gl/deffer_detail_w_flat.vs @@ -14,7 +14,7 @@ v2p_flat _main (v_detail v) { v2p_flat O; // index - int i = v.misc.w; + int i = int(v.misc.w); float4 m0 = array[i+0]; float4 m1 = array[i+1]; float4 m2 = array[i+2]; diff --git a/res/gamedata/shaders/gl/iostructs/v_detail.h b/res/gamedata/shaders/gl/iostructs/v_detail.h index f1e5deffede..f275389418d 100644 --- a/res/gamedata/shaders/gl/iostructs/v_detail.h +++ b/res/gamedata/shaders/gl/iostructs/v_detail.h @@ -2,7 +2,7 @@ out gl_PerVertex { vec4 gl_Position; }; layout(location = POSITION) in float4 v_detail_pos ; // POSITION; // (float,float,float,1) -layout(location = TEXCOORD0) in int4 v_detail_misc ; // TEXCOORD0; // (u(Q),v(Q),frac,matrix-id) +layout(location = TEXCOORD0) in float4 v_detail_misc ; // TEXCOORD0; // (u(Q),v(Q),frac,matrix-id) #if defined(USE_R2_STATIC_SUN) && !defined(USE_LM_HEMI) layout(location = TEXCOORD0) out float4 v2p_flat_tcdh ; // TEXCOORD0; // Texture coordinates, w=sun_occlusion