Mesa (master): i965: Fix up part of my Sandybridge attributes support patch .
Eric Anholt
anholt at kemper.freedesktop.org
Tue Sep 28 17:11:13 UTC 2010
Module: Mesa
Branch: master
Commit: ef8e002c75a5def2c400638336dcd55d411d87be
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef8e002c75a5def2c400638336dcd55d411d87be
Author: Eric Anholt <eric at anholt.net>
Date: Tue Sep 28 10:05:10 2010 -0700
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.
---
src/mesa/drivers/dri/i965/brw_wm.h | 6 ++++--
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 a38df1e..ae6a1d5 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;
More information about the mesa-commit
mailing list