diff options
| author | Brian Paul <brianp@vmware.com> | 2013-01-22 17:44:02 -0700 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-02-13 18:46:39 +0100 |
| commit | 998f402af5b37aadc6dc8adcc19f7b6428ada007 (patch) | |
| tree | b051c559d10fcf64522447c0214600fea3ce2f70 | |
| parent | 63f858943084b5cbeb20cce96ccae3c25e633663 (diff) | |
| download | mesa3d-998f402af5b37aadc6dc8adcc19f7b6428ada007.tar.gz | |
mesa: use GLbitfield64 when copying program inputs
Note: This is a candidate for the 9.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
(cherry picked from commit ccbb479f4090948ed3765495192332ebc4cf1f4f)
| -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 15337f4d8aa..f391a120457 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -732,7 +732,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); @@ -760,7 +760,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); |