Merge commit 'origin/gallium-master-merge'

This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.

Conflicts:

	progs/demos/Makefile
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c

1 files changed, 24 insertions, 0 deletions

diff --git a/progs/vpglsl/varfor2f.glsl b/progs/vpglsl/varfor2f.glsl
new file mode 100644
index 00000000000..d98a1100458
--- /dev/null
+++ b/progs/vpglsl/varfor2f.glsl
@@ -0,0 +1,24 @@
+const int KernelSize = 9;
+uniform vec2 KernelValue2f[KernelSize];
+
+void main(void)
+{
+    int i;
+    vec4 sum = vec4(0.0);
+    vec4 tmp = gl_Color;
+    gl_Position = gl_Vertex;
+
+    for (i = 0; i < KernelSize; ++i) {
+        vec2 rg, ba;
+
+        rg = KernelValue2f[i];
+        ++i;
+        if (i < KernelSize)
+	    ba = KernelValue2f[i];
+	else
+	    ba = vec2(0, 0);
+
+        sum += tmp * vec4(rg, ba);
+    }
+    gl_FrontColor = sum;
+}