From e5359401d68fbf52e237b9f95964ad50534d974a Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 10 Nov 2008 10:21:13 -0700 Subject: undo accidental changes to multitex.frag shader --- progs/glsl/multitex.frag | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'progs') diff --git a/progs/glsl/multitex.frag b/progs/glsl/multitex.frag index 61ef95f3fe..a2633ceba7 100644 --- a/progs/glsl/multitex.frag +++ b/progs/glsl/multitex.frag @@ -7,29 +7,9 @@ uniform sampler2D tex1; uniform sampler2D tex2; -vec4 sample(sampler2D t, vec2 coord) -{ - return texture2D(t, coord); -} - -void main0() +void main() { 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); + vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); gl_FragColor = mix(t1, t2, t2.w); } - -void main() -{ - vec4 t1 = sample(tex1, gl_TexCoord[0].xy); - vec4 t2 = sample(tex2, gl_TexCoord[0].xy); - gl_FragColor = t1 + t2; -} -/* - 0: MOV SAMPLER[0].x, SAMPLER[0]; - 1: MOV TEMP[1], INPUT[4]; - 2: TEX OUTPUT[0], TEMP[1], texture[0], 2D; - 3: END -*/ -- cgit v1.2.3 From 90246d3ea54f54d60593dce1b89f0226058a3c56 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 11 Nov 2008 14:33:11 -0700 Subject: mesa: fix version check in dinoshade.c --- progs/tests/dinoshade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'progs') diff --git a/progs/tests/dinoshade.c b/progs/tests/dinoshade.c index 504b4af526..44115b9209 100644 --- a/progs/tests/dinoshade.c +++ b/progs/tests/dinoshade.c @@ -793,7 +793,7 @@ supportsOneDotOne(void) version = (char *) glGetString(GL_VERSION); if (sscanf(version, "%d.%d", &major, &minor) == 2) - return major >= 1 && minor >= 1; + return major * 10 + minor >= 11; return 0; /* OpenGL version string malformed! */ } -- cgit v1.2.3