From 6f8214cae613bc3bead215214e092c07793975e7 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 24 Jul 2009 17:33:30 -0700 Subject: ARB prog: get frag prog texture info from the right place This gets basic texturing working. w00t! --- src/mesa/shader/arbprogparse.c | 6 +++--- src/mesa/shader/program_parser.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index 36470b669c..42a5378999 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 aeb2efd7ab..b4c24ec92c 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; }; -- cgit v1.2.3