Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/shader/prog_execute.c
	src/mesa/shader/slang/library/slang_vertex_builtin_gc.h

2 files changed, 3 insertions, 23 deletions

diff --git a/progs/glsl/multitex.frag b/progs/glsl/multitex.frag
index 61ef95f3fee..a2633ceba75 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
-*/
diff --git a/progs/tests/dinoshade.c b/progs/tests/dinoshade.c
index 504b4af526a..44115b9209d 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! */
 }