projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aa878f9
)
mesa: use BITFIELD64_BIT() macro
author
Brian Paul
<brianp@vmware.com>
Tue, 15 Mar 2011 15:48:26 +0000
(09:48 -0600)
committer
Brian Paul
<brianp@vmware.com>
Wed, 16 Mar 2011 00:21:36 +0000
(18:21 -0600)
src/mesa/program/program.c
patch
|
blob
|
history
diff --git
a/src/mesa/program/program.c
b/src/mesa/program/program.c
index cfdd0da86d8200548a3693b5cf9aa6ca537270fb..79034ab26f29fcefad6c5586a66c0af511365f6c 100644
(file)
--- a/
src/mesa/program/program.c
+++ b/
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.
*/
/* 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);
(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;
/* 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;
inputsB &= ~(1 << FRAG_ATTRIB_COL0);
}
newProg->InputsRead = progA->InputsRead | inputsB;