mesa: use BITFIELD64_BIT() macro

This commit is contained in:
Brian Paul
2011-03-15 09:48:26 -06:00
parent aa878f94ab
commit 11150e4667

View File

@@ -811,7 +811,7 @@ _mesa_combine_programs(struct gl_context *ctx,
/* 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_COLOR)) && if ((progA->OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) &&
(progB_inputsRead & FRAG_BIT_COL0)) { (progB_inputsRead & FRAG_BIT_COL0)) {
GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS, GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,
firstTemp); firstTemp);
@@ -834,7 +834,7 @@ _mesa_combine_programs(struct gl_context *ctx,
/* compute combined program's InputsRead */ /* compute combined program's InputsRead */
inputsB = progB_inputsRead; inputsB = progB_inputsRead;
if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) { if (progA->OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) {
inputsB &= ~(1 << FRAG_ATTRIB_COL0); inputsB &= ~(1 << FRAG_ATTRIB_COL0);
} }
newProg->InputsRead = progA->InputsRead | inputsB; newProg->InputsRead = progA->InputsRead | inputsB;