mesa: rename, reorder FRAG_RESULT_x tokens
s/FRAG_RESULT_DEPR/FRAG_RESULT_DEPTH/ s/FRAG_RESULT_COLR/FRAG_RESULT/COLOR/ Remove FRAG_RESULT_COLH (NV half-precision) output since we never used it. Next, we might merge the COLOR and DATA outputs (COLOR0, COLOR1, etc).
This commit is contained in:
@@ -738,7 +738,7 @@ _mesa_combine_programs(GLcontext *ctx,
|
||||
/* Connect color outputs of fprogA to color inputs of fprogB, via a
|
||||
* new temporary register.
|
||||
*/
|
||||
if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) &&
|
||||
if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&
|
||||
(progB_inputsRead & FRAG_BIT_COL0)) {
|
||||
GLint tempReg = _mesa_find_free_register(newProg, PROGRAM_TEMPORARY);
|
||||
if (tempReg < 0) {
|
||||
@@ -748,7 +748,7 @@ _mesa_combine_programs(GLcontext *ctx,
|
||||
}
|
||||
/* replace writes to result.color[0] with tempReg */
|
||||
replace_registers(newInst, lenA,
|
||||
PROGRAM_OUTPUT, FRAG_RESULT_COLR,
|
||||
PROGRAM_OUTPUT, FRAG_RESULT_COLOR,
|
||||
PROGRAM_TEMPORARY, tempReg);
|
||||
/* replace reads from the input color with tempReg */
|
||||
replace_registers(newInst + lenA, lenB,
|
||||
@@ -758,7 +758,7 @@ _mesa_combine_programs(GLcontext *ctx,
|
||||
|
||||
/* compute combined program's InputsRead */
|
||||
inputsB = progB_inputsRead;
|
||||
if (progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) {
|
||||
if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {
|
||||
inputsB &= ~(1 << FRAG_ATTRIB_COL0);
|
||||
}
|
||||
newProg->InputsRead = progA->InputsRead | inputsB;
|
||||
|
Reference in New Issue
Block a user