summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/config.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-05-14 16:09:46 -0600
committerBrian Paul <[email protected]>2008-05-14 16:09:46 -0600
commitade508312c701ce89d3c2cd717994dbbabb4f207 (patch)
tree7c7a35935143d90c99820025a8887c5606041db6 /src/mesa/main/config.h
parentc807c1a23fc918591e9d2f6f26c4e071a725bced (diff)
Updated GLSL uniform/sampler handling from gallium-0.1 branch
Previously, the shader linker combined the uniforms used by the vertex and fragment shaders into a combined set of uniforms. This made the implementation of glUniform*() simple, but was rather inefficient otherwise. Now each shader gets its own set of uniforms (no more modelview matrix showing up in the fragment shader uniforms, for example). cherry-picked by hand from gallium-0.1 branch
Diffstat (limited to 'src/mesa/main/config.h')
-rw-r--r--src/mesa/main/config.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index ab0f035b45b..58a39d11d4d 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -188,6 +188,7 @@
#define MAX_PROGRAM_ADDRESS_REGS 2
#define MAX_UNIFORMS 128
#define MAX_VARYING 8
+#define MAX_SAMPLERS 8
/*@}*/
/** For GL_NV_vertex_program */