OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undo accidental changes to multitex.frag shader

Browse Source
This commit is contained in:
Brian Paul
2008-11-10 10:21:13 -07:00
parent f1c9016af1
commit e5359401d6
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
progs/glsl/multitex.frag
View File

@@ -7,29 +7,9 @@
uniform sampler2D tex1; uniform sampler2D tex1;
uniform sampler2D tex2; uniform sampler2D tex2;
vec4 sample(sampler2D t, vec2 coord)
{
return texture2D(t, coord);
}
void main0()
{
vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy);
//vec4 t1 = sample(tex1, gl_TexCoord[0].xy);
//vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy);
vec4 t2 = sample(tex2, gl_TexCoord[0].xy);
gl_FragColor = mix(t1, t2, t2.w);
}
void main() void main()
{ {
vec4 t1 = sample(tex1, gl_TexCoord[0].xy); vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy);
vec4 t2 = sample(tex2, gl_TexCoord[0].xy); vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy);
gl_FragColor = t1 + t2; gl_FragColor = mix(t1, t2, t2.w);
} }
/*
0: MOV SAMPLER[0].x, SAMPLER[0];
1: MOV TEMP[1], INPUT[4];
2: TEX OUTPUT[0], TEMP[1], texture[0], 2D;
3: END
*/