Mesa (master): mesa: use GLbitfield64 when copying program inputs
Brian Paul
brianp at kemper.freedesktop.org
Fri Jan 25 22:48:26 UTC 2013
Module: Mesa
Branch: master
Commit: ccbb479f4090948ed3765495192332ebc4cf1f4f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccbb479f4090948ed3765495192332ebc4cf1f4f
Author: Brian Paul <brianp at vmware.com>
Date: Tue Jan 22 17:44:02 2013 -0700
mesa: use GLbitfield64 when copying program inputs
Note: This is a candidate for the 9.0 branch.
Reviewed-by: José Fonseca <jfonseca at vmware.com>
---
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);
More information about the mesa-commit
mailing list