diff options
| author | Brian Paul <brianp@vmware.com> | 2013-01-22 17:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-01-25 15:41:38 -0700 |
| commit | ccbb479f4090948ed3765495192332ebc4cf1f4f (patch) | |
| tree | d196d46bca86e42c7881b711ce6cf370e4669a7c /src/mesa/program/program.c | |
| parent | 701a0f6a769ed257057be365cbe88e9f114bc05d (diff) | |
| download | external_mesa3d-ccbb479f4090948ed3765495192332ebc4cf1f4f.zip external_mesa3d-ccbb479f4090948ed3765495192332ebc4cf1f4f.tar.gz external_mesa3d-ccbb479f4090948ed3765495192332ebc4cf1f4f.tar.bz2 | |
mesa: use GLbitfield64 when copying program inputs
Note: This is a candidate for the 9.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/mesa/program/program.c')
| -rw-r--r-- | 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); |