diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 6 | ||||
| -rw-r--r-- | src/mesa/shader/program_parser.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index 36470b669c5..42a53789999 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -3971,11 +3971,11 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target, program->Base.InputsRead = prog.InputsRead; program->Base.OutputsWritten = prog.OutputsWritten; for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++) { - program->Base.TexturesUsed[i] = state.fragment.TexturesUsed[i]; - if (state.fragment.TexturesUsed[i]) + program->Base.TexturesUsed[i] = prog.TexturesUsed[i]; + if (prog.TexturesUsed[i]) program->Base.SamplersUsed |= (1 << i); } - program->Base.ShadowSamplers = state.fragment.ShadowSamplers; + program->Base.ShadowSamplers = prog.ShadowSamplers; switch (state.option.Fog) { case OPTION_FOG_EXP: program->FogOption = GL_EXP; break; case OPTION_FOG_EXP2: program->FogOption = GL_EXP2; break; diff --git a/src/mesa/shader/program_parser.h b/src/mesa/shader/program_parser.h index aeb2efd7ab6..b4c24ec92cc 100644 --- a/src/mesa/shader/program_parser.h +++ b/src/mesa/shader/program_parser.h @@ -194,8 +194,6 @@ struct asm_parser_state { } option; struct { - unsigned TexturesUsed[MAX_TEXTURE_IMAGE_UNITS]; - unsigned ShadowSamplers; unsigned UsesKill:1; } fragment; }; |