[Mesa-dev] [PATCH 03/11] mesa: use GLbitfield64 when copying program inputs

Brian Paul brianp at vmware.com
Tue Jan 22 16:51:13 PST 2013


Note: This is a candidate for the 9.0 branch.
---
 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 0cca460..fb0aeb7 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -696,7 +696,7 @@ _mesa_combine_programs(struct gl_context *ctx,
    const GLuint newLength = lenA + lenB;
    GLboolean usedTemps[MAX_PROGRAM_TEMPS];
    GLuint firstTemp = 0;
-   GLbitfield inputsB;
+   GLbitfield64 inputsB;
    GLuint i;
 
    ASSERT(progA->Target == progB->Target);
@@ -724,7 +724,7 @@ _mesa_combine_programs(struct gl_context *ctx,
    if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) {
       const struct gl_fragment_program *fprogA, *fprogB;
       struct gl_fragment_program *newFprog;
-      GLbitfield progB_inputsRead = progB->InputsRead;
+      GLbitfield64 progB_inputsRead = progB->InputsRead;
       GLint progB_colorFile, progB_colorIndex;
 
       fprogA = gl_fragment_program_const(progA);
-- 
1.7.3.4



More information about the mesa-dev mailing list