summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/arbprogparse.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2006-03-29 15:15:37 +0000
committerBrian Paul <[email protected]>2006-03-29 15:15:37 +0000
commit006e183b6edb4d4a7cce69c42939ec24fe41578d (patch)
tree543c2eb9a4e4cd51e94b91172dc0f6ff0fedfd91 /src/mesa/shader/arbprogparse.c
parent180b0dab8b87ef7987b9f2c44068d1eea3f54939 (diff)
move NumNativeAlu/TexInstruction assignments (Ewald Snel)
Diffstat (limited to 'src/mesa/shader/arbprogparse.c')
-rw-r--r--src/mesa/shader/arbprogparse.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index a3c433b0c3d..a7068e6dbcf 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -3745,12 +3745,6 @@ parse_instructions(GLcontext * ctx, GLubyte * inst, struct var_cache **vc_head,
Program->Base.NumNativeParameters = Program->Base.NumParameters;
Program->Base.NumNativeAttributes = Program->Base.NumAttributes;
Program->Base.NumNativeAddressRegs = Program->Base.NumAddressRegs;
- if (Program->Base.Target == GL_FRAGMENT_PROGRAM_ARB) {
- struct fragment_program *fp = (struct fragment_program *) Program;
- fp->NumNativeAluInstructions = fp->NumAluInstructions;
- fp->NumNativeTexInstructions = fp->NumTexInstructions;
- fp->NumNativeTexIndirections = fp->NumTexIndirections;
- }
return err;
}
@@ -4074,6 +4068,9 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
program->NumAluInstructions = ap.NumAluInstructions;
program->NumTexInstructions = ap.NumTexInstructions;
program->NumTexIndirections = ap.NumTexIndirections;
+ program->NumNativeAluInstructions = ap.NumAluInstructions;
+ program->NumNativeTexInstructions = ap.NumTexInstructions;
+ program->NumNativeTexIndirections = ap.NumTexIndirections;
program->Base.InputsRead = ap.Base.InputsRead;
program->Base.OutputsWritten = ap.Base.OutputsWritten;
for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)