diff options
| author | Chia-I Wu <[email protected]> | 2011-10-23 18:29:17 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-11-03 15:09:44 +0800 |
| commit | 1ab1b15e9d0da1c5215a20770735b5477f5313df (patch) | |
| tree | 0965de0f946151245341d434924f3bafa844284f /src/mesa/program | |
| parent | 833d707db13afd2c4940be65a0e18d4e98cb8ec3 (diff) | |
mesa, i965: prepare for more than 8 texture targets
3-bit fields are used store texture target in several places. That will fail
when TEXTURE_EXTERNAL_INDEX, which happends to be the 9th texture target, is
added. Make them 4-bit fields.
Reviewed-by: Brian Paul <[email protected]>
Acked-by: Jakob Bornecrantz <[email protected]>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/prog_instruction.h | 2 | ||||
| -rw-r--r-- | src/mesa/program/program.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/program/prog_instruction.h b/src/mesa/program/prog_instruction.h index db2b594e753..09659ce9c7c 100644 --- a/src/mesa/program/prog_instruction.h +++ b/src/mesa/program/prog_instruction.h @@ -392,7 +392,7 @@ struct prog_instruction GLuint TexSrcUnit:5; /** Source texture target, one of TEXTURE_{1D,2D,3D,CUBE,RECT}_INDEX */ - GLuint TexSrcTarget:3; + GLuint TexSrcTarget:4; /** True if tex instruction should do shadow comparison */ GLuint TexShadow:1; diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 7366525294a..582cbccf8fa 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -78,7 +78,7 @@ _mesa_init_program(struct gl_context *ctx) ASSERT(MAX_TEXTURE_UNITS <= (1 << 5)); /* If this fails, increase prog_instruction::TexSrcTarget size */ - ASSERT(NUM_TEXTURE_TARGETS <= (1 << 3)); + ASSERT(NUM_TEXTURE_TARGETS <= (1 << 4)); ctx->Program.ErrorPos = -1; ctx->Program.ErrorString = _mesa_strdup(""); |