summaryrefslogtreecommitdiffstats
path: root/src/mesa/program
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2013-01-22 17:44:02 -0700
committerBrian Paul <[email protected]>2013-01-25 15:41:38 -0700
commitccbb479f4090948ed3765495192332ebc4cf1f4f (patch)
treed196d46bca86e42c7881b711ce6cf370e4669a7c /src/mesa/program
parent701a0f6a769ed257057be365cbe88e9f114bc05d (diff)
mesa: use GLbitfield64 when copying program inputs
Note: This is a candidate for the 9.0 branch. Reviewed-by: José Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/program')
-rw-r--r--src/mesa/program/program.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index 0cca460ceae..fb0aeb7edaa 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);