diff options
| author | Christian König <[email protected]> | 2011-01-20 22:10:37 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-20 22:10:37 +0100 |
| commit | d2ff6b8715e817c1ef14d4bf12be58c19d894143 (patch) | |
| tree | 281badfe8638da50221270af29e16da1e40d9a6a /src/mesa/program/prog_execute.h | |
| parent | e755c7bec3bc722ee451bdaed8da741f337d33b3 (diff) | |
| parent | d136d1d2e1174d2420ce5e32507904243ab240cd (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/mesa/program/prog_execute.h')
| -rw-r--r-- | src/mesa/program/prog_execute.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/program/prog_execute.h b/src/mesa/program/prog_execute.h index cefd468c36b..cdf37082a00 100644 --- a/src/mesa/program/prog_execute.h +++ b/src/mesa/program/prog_execute.h @@ -61,6 +61,7 @@ struct gl_program_machine GLfloat (*EnvParams)[4]; /**< Vertex or Fragment env parameters */ GLuint CondCodes[4]; /**< COND_* value for x/y/z/w */ GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4]; + GLfloat SystemValues[SYSTEM_VALUE_MAX][4]; const GLubyte *Samplers; /** Array mapping sampler var to tex unit */ |