diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-17 14:17:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-17 14:17:54 +0000 |
| commit | 76b655664dad149451d0abaa15929d1b7b62e0c6 (patch) | |
| tree | e7c3389fec52eaad405e2025e04555766493022c /mesalib/src/mesa/program | |
| parent | a44b2f0d059871926ffb84dabdae53ddaa390beb (diff) | |
| parent | d7f1bd4112420f1d4b41c5409074eca6b34bf507 (diff) | |
| download | vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.tar.gz vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.tar.bz2 vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/program.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c index 6c97787e8..e0bffc7c6 100644 --- a/mesalib/src/mesa/program/program.c +++ b/mesalib/src/mesa/program/program.c @@ -811,7 +811,7 @@ _mesa_combine_programs(struct gl_context *ctx, /* Connect color outputs of fprogA to color inputs of fprogB, via a
* new temporary register.
*/
- if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&
+ if ((progA->OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) &&
(progB_inputsRead & FRAG_BIT_COL0)) {
GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,
firstTemp);
@@ -834,7 +834,7 @@ _mesa_combine_programs(struct gl_context *ctx, /* compute combined program's InputsRead */
inputsB = progB_inputsRead;
- if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {
+ if (progA->OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) {
inputsB &= ~(1 << FRAG_ATTRIB_COL0);
}
newProg->InputsRead = progA->InputsRead | inputsB;
|