1
0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-15 06:04:49 +01:00

fix texture name

This commit is contained in:
FunkyFr3sh 2023-08-29 18:27:47 +02:00
parent 1cfa20802c
commit ccea9911b5

View File

@ -395,7 +395,7 @@ static char XBR_LV2_FRAG_SHADER[] =
"uniform vec2 OutputSize;\n"
"uniform vec2 TextureSize;\n"
"uniform vec2 InputSize;\n"
"uniform sampler2D decal;\n"
"uniform sampler2D Texture;\n"
"in vec2 texCoord;\n"
"in vec4 t1;\n"
"in vec4 t2;\n"
@ -490,27 +490,27 @@ static char XBR_LV2_FRAG_SHADER[] =
"\n"
" vec2 fp = fract(texCoord*TextureSize);\n"
"\n"
" vec3 A1 = texture(decal, t1.xw ).xyz;\n"
" vec3 B1 = texture(decal, t1.yw ).xyz;\n"
" vec3 C1 = texture(decal, t1.zw ).xyz;\n"
" vec3 A = texture(decal, t2.xw ).xyz;\n"
" vec3 B = texture(decal, t2.yw ).xyz;\n"
" vec3 C = texture(decal, t2.zw ).xyz;\n"
" vec3 D = texture(decal, t3.xw ).xyz;\n"
" vec3 E = texture(decal, t3.yw ).xyz;\n"
" vec3 F = texture(decal, t3.zw ).xyz;\n"
" vec3 G = texture(decal, t4.xw ).xyz;\n"
" vec3 H = texture(decal, t4.yw ).xyz;\n"
" vec3 I = texture(decal, t4.zw ).xyz;\n"
" vec3 G5 = texture(decal, t5.xw ).xyz;\n"
" vec3 H5 = texture(decal, t5.yw ).xyz;\n"
" vec3 I5 = texture(decal, t5.zw ).xyz;\n"
" vec3 A0 = texture(decal, t6.xy ).xyz;\n"
" vec3 D0 = texture(decal, t6.xz ).xyz;\n"
" vec3 G0 = texture(decal, t6.xw ).xyz;\n"
" vec3 C4 = texture(decal, t7.xy ).xyz;\n"
" vec3 F4 = texture(decal, t7.xz ).xyz;\n"
" vec3 I4 = texture(decal, t7.xw ).xyz;\n"
" vec3 A1 = texture(Texture, t1.xw ).xyz;\n"
" vec3 B1 = texture(Texture, t1.yw ).xyz;\n"
" vec3 C1 = texture(Texture, t1.zw ).xyz;\n"
" vec3 A = texture(Texture, t2.xw ).xyz;\n"
" vec3 B = texture(Texture, t2.yw ).xyz;\n"
" vec3 C = texture(Texture, t2.zw ).xyz;\n"
" vec3 D = texture(Texture, t3.xw ).xyz;\n"
" vec3 E = texture(Texture, t3.yw ).xyz;\n"
" vec3 F = texture(Texture, t3.zw ).xyz;\n"
" vec3 G = texture(Texture, t4.xw ).xyz;\n"
" vec3 H = texture(Texture, t4.yw ).xyz;\n"
" vec3 I = texture(Texture, t4.zw ).xyz;\n"
" vec3 G5 = texture(Texture, t5.xw ).xyz;\n"
" vec3 H5 = texture(Texture, t5.yw ).xyz;\n"
" vec3 I5 = texture(Texture, t5.zw ).xyz;\n"
" vec3 A0 = texture(Texture, t6.xy ).xyz;\n"
" vec3 D0 = texture(Texture, t6.xz ).xyz;\n"
" vec3 G0 = texture(Texture, t6.xw ).xyz;\n"
" vec3 C4 = texture(Texture, t7.xy ).xyz;\n"
" vec3 F4 = texture(Texture, t7.xz ).xyz;\n"
" vec3 I4 = texture(Texture, t7.xw ).xyz;\n"
"\n"
" vec4 b = vec4(dot(B ,rgbw), dot(D ,rgbw), dot(H ,rgbw), dot(F ,rgbw));\n"
" vec4 c = vec4(dot(C ,rgbw), dot(A ,rgbw), dot(G ,rgbw), dot(I ,rgbw));\n"