diff options
| author | Brian <brian@yutani.localnet.net> | 2007-02-26 13:11:20 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-02-26 13:11:20 -0700 |
| commit | 25ea5ea27e7fa4bd7151723d7549a0c33ac1ceda (patch) | |
| tree | 845f42be66305613b31728728109939c7b51bba7 /src/mesa/shader/prog_execute.h | |
| parent | 32fbbf38b4358acd46569fd3c2b21fbc21e417a8 (diff) | |
| parent | 3c1c999226859216b8af35c4806413b4488f21b4 (diff) | |
Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
Diffstat (limited to 'src/mesa/shader/prog_execute.h')
| -rw-r--r-- | src/mesa/shader/prog_execute.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/shader/prog_execute.h b/src/mesa/shader/prog_execute.h index 1eb9e73d01..47845e9111 100644 --- a/src/mesa/shader/prog_execute.h +++ b/src/mesa/shader/prog_execute.h @@ -55,9 +55,9 @@ struct gl_program_machine GLfloat Temporaries[MAX_PROGRAM_TEMPS][4]; GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4]; + GLfloat (*EnvParams)[4]; /**< Vertex or Fragment env parameters */ GLuint CondCodes[4]; /**< COND_* value for x/y/z/w */ - - GLint AddressReg[MAX_VERTEX_PROGRAM_ADDRESS_REGS][4]; + GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4]; GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */ GLuint StackDepth; /**< Index/ptr to top of CallStack[] */ @@ -74,8 +74,8 @@ _mesa_get_program_register(GLcontext *ctx, enum register_file file, extern GLboolean _mesa_execute_program(GLcontext *ctx, - const struct gl_program *program, GLuint maxInst, - struct gl_program_machine *machine, GLuint element); + const struct gl_program *program, + struct gl_program_machine *machine); #endif /* PROG_EXECUTE_H */ |