Mesa (master): i915g: Roll back to the previous shader limits.

[Stephane Marchesin]

Module: Mesa
Branch: master
Commit: 642d11da207e9becfa26a9e038db1c7520ec2aee
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=642d11da207e9becfa26a9e038db1c7520ec2aee

Author: Stéphane Marchesin <marcheu at chromium.org>
Date:   Thu Dec  8 19:22:13 2011 -0800

i915g: Roll back to the previous shader limits.

Those shader limits seem to be responsible for a piglit hang.

---

 src/gallium/drivers/i915/i915_fpc.h    |    2 +-
 src/gallium/drivers/i915/i915_reg.h    |    4 ----
 src/gallium/drivers/i915/i915_screen.c |    2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_fpc.h b/src/gallium/drivers/i915/i915_fpc.h
index bfd658f..26cf2fb 100644
--- a/src/gallium/drivers/i915/i915_fpc.h
+++ b/src/gallium/drivers/i915/i915_fpc.h
@@ -37,7 +37,7 @@
 
 #include "tgsi/tgsi_parse.h"
 
-#define I915_PROGRAM_SIZE (3 * I915_MAX_INSN)
+#define I915_PROGRAM_SIZE 192
 
 /* Use those indices for pos/face routing, must be >= num of inputs */
 #define I915_SEMANTIC_POS  100
diff --git a/src/gallium/drivers/i915/i915_reg.h b/src/gallium/drivers/i915/i915_reg.h
index 620c64e..e48a942 100644
--- a/src/gallium/drivers/i915/i915_reg.h
+++ b/src/gallium/drivers/i915/i915_reg.h
@@ -488,10 +488,6 @@
 #define I915_MAX_DECL_INSN    27
 #define I915_MAX_TEMPORARY    16
 
-#define I915_MAX_INSN          (I915_MAX_DECL_INSN + \
-				I915_MAX_TEX_INSN + \
-				I915_MAX_ALU_INSN)
-
 
 /* Each instruction is 3 dwords long, though most don't require all
  * this space.  Maximum of 123 instructions.  Smaller maxes per insn
diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
index 7ef24f5..991f03b 100644
--- a/src/gallium/drivers/i915/i915_screen.c
+++ b/src/gallium/drivers/i915/i915_screen.c
@@ -114,7 +114,7 @@ i915_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe_sha
          return draw_get_shader_param(shader, cap);
       }
    case PIPE_SHADER_FRAGMENT:
-      /* XXX: these are just shader model 2.0 values, fix this! */
+      /* XXX: some of these are just shader model 2.0 values, fix this! */
       switch(cap) {
       case PIPE_SHADER_CAP_MAX_INSTRUCTIONS:
          return I915_MAX_ALU_INSN + I915_MAX_TEX_INSN;