fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix InputsRead bug in _mesa_combine_programs()

Browse source
This commit is contained in:
Brian 2007-10-30 18:26:34 -06:00
parent c1b2b97b8a
commit fb9cf48259
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/shader/program.c
View file

@ -469,6 +469,7 @@ _mesa_combine_programs(GLcontext *ctx,
const GLuint lenB = progB->NumInstructions;
const GLuint numParamsA = _mesa_num_parameters(progA->Parameters);
const GLuint newLength = lenA + lenB;
GLbitfield inputsB;
GLuint i;
ASSERT(progA->Target == progB->Target);
@ -498,8 +499,11 @@ _mesa_combine_programs(GLcontext *ctx,
PROGRAM_OUTPUT, FRAG_RESULT_COLR);
}
newProg->InputsRead = progA->InputsRead;
newProg->InputsRead |= (progB->InputsRead & ~(1 << FRAG_ATTRIB_COL0));
inputsB = progB->InputsRead;
if (progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) {
inputsB &= ~(1 << FRAG_ATTRIB_COL0);
}
newProg->InputsRead = progA->InputsRead | inputsB;
newProg->OutputsWritten = progB->OutputsWritten;
}
else {