From: Brian Paul <brianp@vmware.com>
Date: Wed, 31 Dec 2008 01:01:15 +0000 (-0700)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=c789bd376f09c3b61617aeef6f5adbba2c541178

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/main/config.h
---

c789bd376f09c3b61617aeef6f5adbba2c541178
diff --cc src/mesa/main/config.h
index e29964a1e86,424ed60b571..ec7e156ebd8
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@@ -180,8 -183,7 +180,8 @@@
  
  /** 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