Mesa (master): mesa: use BITFIELD64_BIT() macro

Brian Paul brianp at kemper.freedesktop.org
Wed Mar 16 02:14:47 UTC 2011


Module: Mesa
Branch: master
Commit: 11150e4667ce11b056d98244754ce3f2a79599a6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=11150e4667ce11b056d98244754ce3f2a79599a6

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Mar 15 09:48:26 2011 -0600

mesa: use BITFIELD64_BIT() macro

---

 src/mesa/program/program.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index cfdd0da..79034ab 100644
--- 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.
        */
-      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;




More information about the mesa-commit mailing list