summaryrefslogtreecommitdiff
path: root/src/mesa/shader/prog_execute.h
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-02-24 15:49:54 -0700
committerBrian <brian@yutani.localnet.net>2007-02-24 15:49:54 -0700
commit292a80466d3e0b1cec998f2dc1b0abe25dc10fb8 (patch)
tree49fd3624ec9536c222c91b19736cc49bcfa72034 /src/mesa/shader/prog_execute.h
parent5e80c62f3178a65bebca942aa0b1e5d16c34b2a9 (diff)
Outputs[] array wasn't large enough, define MAX_PROGRAM_OUTPUTS, new assertions.
Diffstat (limited to 'src/mesa/shader/prog_execute.h')
-rw-r--r--src/mesa/shader/prog_execute.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_execute.h b/src/mesa/shader/prog_execute.h
index 0e737657e3..1eb9e73d01 100644
--- a/src/mesa/shader/prog_execute.h
+++ b/src/mesa/shader/prog_execute.h
@@ -35,6 +35,10 @@ typedef void (*FetchTexelDerivFunc)(GLcontext *ctx, const GLfloat texcoord[4],
GLuint unit, GLfloat color[4]);
+/** The larger of VERT_RESULT_MAX, FRAG_RESULT_MAX */
+#define MAX_PROGRAM_OUTPUTS VERT_RESULT_MAX
+
+
/**
* Virtual machine state used during execution of vertex/fragment programs.
*/
@@ -50,7 +54,7 @@ struct gl_program_machine
GLfloat VertAttribs[VERT_ATTRIB_MAX][4];
GLfloat Temporaries[MAX_PROGRAM_TEMPS][4];
- GLfloat Outputs[FRAG_RESULT_MAX][4];
+ GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4];
GLuint CondCodes[4]; /**< COND_* value for x/y/z/w */
GLint AddressReg[MAX_VERTEX_PROGRAM_ADDRESS_REGS][4];