OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: in _mesa_combine_programs() take new STATE_CURRENT_ATTRIB color into account

Browse Source 
Commit 1680ef8696 changed the texenv program
to get color from a state register instead of a constant-valued vertex
attribute.  This broke program concatenation (so glDraw/CopyPixels broke).
Now check if the second program get's color from a constant register and
handle that case appropriately.
This commit is contained in:
Brian Paul
2008-10-08 14:02:24 -06:00
parent 4f1dafaa82
commit 5c4bd76cb6
1 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mesa/shader/program.c
View File

@@ -594,17 +594,47 @@ _mesa_combine_programs(GLcontext *ctx,
if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) { if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) {
struct gl_fragment_program *fprogA, *fprogB, *newFprog; struct gl_fragment_program *fprogA, *fprogB, *newFprog;
GLbitfield progB_inputsRead = progB->InputsRead;
GLint progB_colorFile, progB_colorIndex;
fprogA = (struct gl_fragment_program *) progA; fprogA = (struct gl_fragment_program *) progA;
fprogB = (struct gl_fragment_program *) progB; fprogB = (struct gl_fragment_program *) progB;
newFprog = (struct gl_fragment_program *) newProg; newFprog = (struct gl_fragment_program *) newProg;
newFprog->UsesKill = fprogA->UsesKill || fprogB->UsesKill; newFprog->UsesKill = fprogA->UsesKill || fprogB->UsesKill;
/* We'll do a search and replace for instances
* of progB_colorFile/progB_colorIndex below...
*/
progB_colorFile = PROGRAM_INPUT;
progB_colorIndex = FRAG_ATTRIB_COL0;
/*
* The fragment program may get color from a state var rather than
* a fragment input (vertex output) if it's constant.
* See the texenvprogram.c code.
* So, search the program's parameter list now to see if the program
* gets color from a state var instead of a conventional fragment
* input register.
*/
for (i = 0; i < progB->Parameters->NumParameters; i++) {
struct gl_program_parameter *p = &progB->Parameters->Parameters[i];
if (p->Type == PROGRAM_STATE_VAR &&
p->StateIndexes[0] == STATE_INTERNAL &&
p->StateIndexes[1] == STATE_CURRENT_ATTRIB &&
p->StateIndexes[2] == VERT_ATTRIB_COLOR0) {
progB_inputsRead |= FRAG_BIT_COL0;
progB_colorFile = PROGRAM_STATE_VAR;
progB_colorIndex = i;
break;
}
}
/* Connect color outputs of fprogA to color inputs of fprogB, via a /* Connect color outputs of fprogA to color inputs of fprogB, via a
* new temporary register. * new temporary register.
*/ */
if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) && if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) &&
(progB->InputsRead & (1 << FRAG_ATTRIB_COL0))) { (progB_inputsRead & FRAG_BIT_COL0)) {
GLint tempReg = _mesa_find_free_register(newProg, PROGRAM_TEMPORARY); GLint tempReg = _mesa_find_free_register(newProg, PROGRAM_TEMPORARY);
if (tempReg < 0) { if (tempReg < 0) {
_mesa_problem(ctx, "No free temp regs found in " _mesa_problem(ctx, "No free temp regs found in "
@@ -615,13 +645,14 @@ _mesa_combine_programs(GLcontext *ctx,
replace_registers(newInst, lenA, replace_registers(newInst, lenA,
PROGRAM_OUTPUT, FRAG_RESULT_COLR, PROGRAM_OUTPUT, FRAG_RESULT_COLR,
PROGRAM_TEMPORARY, tempReg); PROGRAM_TEMPORARY, tempReg);
/* replace reads from input.color[0] with tempReg */ /* replace reads from the input color with tempReg */
replace_registers(newInst + lenA, lenB, replace_registers(newInst + lenA, lenB,
PROGRAM_INPUT, FRAG_ATTRIB_COL0, progB_colorFile, progB_colorIndex, /* search for */
PROGRAM_TEMPORARY, tempReg); PROGRAM_TEMPORARY, tempReg /* replace with */ );
} }
inputsB = progB->InputsRead; /* compute combined program's InputsRead */
inputsB = progB_inputsRead;
if (progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) { if (progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) {
inputsB &= ~(1 << FRAG_ATTRIB_COL0); inputsB &= ~(1 << FRAG_ATTRIB_COL0);
} }