Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/main/config.h

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index e29964a1e86..ec7e156ebd8 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -181,14 +181,14 @@
 /** For any program target/extension */
 /*@{*/
 #define MAX_PROGRAM_INSTRUCTIONS  (16 * 1024)
-#define MAX_PROGRAM_LOCAL_PARAMS 128 /* KW: power of two */
+#define MAX_PROGRAM_LOCAL_PARAMS 256 /**< per-program constants (power of two) */
 #define MAX_PROGRAM_ENV_PARAMS 128
 #define MAX_PROGRAM_MATRICES 8
 #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
 #define MAX_PROGRAM_CALL_DEPTH 8
 #define MAX_PROGRAM_TEMPS 128
 #define MAX_PROGRAM_ADDRESS_REGS 2
-#define MAX_UNIFORMS 128   /**< number of float components */
+#define MAX_UNIFORMS 256   /**< number of vec4 uniforms */
 #define MAX_VARYING 8      /**< number of float[4] vectors */
 #define MAX_SAMPLERS 8
 #define MAX_PROGRAM_INPUTS 32