summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-09-28 10:05:10 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-09-28 18:40:32 -0700
commit83854a9c84ee664707383e83cc0a1b9b5b870052 (patch)
treeb1710f33f97460290abfebc9bf1a29b358a232db
parentb4824096b0ab5a6d8b835ce1047f1cc84e365d9c (diff)
i965: Fix up part of my Sandybridge attributes support patch.
I confused the array sizing for number of files for the number of regs in a file. (cherry picked from commit ef8e002c75a5def2c400638336dcd55d411d87be)
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h
index a38df1e111e..ae6a1d56f7e 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.h
+++ b/src/mesa/drivers/dri/i965/brw_wm.h
@@ -182,6 +182,8 @@ struct brw_wm_instruction {
#define MAX_WM_OPCODE (MAX_OPCODE + 9)
#define PROGRAM_PAYLOAD (PROGRAM_FILE_MAX)
+#define NUM_FILES (PROGRAM_PAYLOAD + 1)
+
#define PAYLOAD_DEPTH (FRAG_ATTRIB_MAX)
#define PAYLOAD_W (FRAG_ATTRIB_MAX + 1)
#define PAYLOAD_FP_REG_MAX (FRAG_ATTRIB_MAX + 2)
@@ -227,7 +229,7 @@ struct brw_wm_compile {
} payload;
- const struct brw_wm_ref *pass0_fp_reg[PAYLOAD_FP_REG_MAX][256][4];
+ const struct brw_wm_ref *pass0_fp_reg[NUM_FILES][256][4];
struct brw_wm_ref undef_ref;
struct brw_wm_value undef_value;
@@ -255,7 +257,7 @@ struct brw_wm_compile {
struct {
GLboolean inited;
struct brw_reg reg;
- } wm_regs[PAYLOAD_FP_REG_MAX][256][4];
+ } wm_regs[NUM_FILES][256][4];
GLboolean used_grf[BRW_WM_MAX_GRF];
GLuint first_free_grf;