diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-18 16:34:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-18 16:34:52 +0100 |
| commit | 1923199a967ec1add54ad8c0e5d48ee320efdb9f (patch) | |
| tree | b8c3af0c9f15576a65d85bb80f94546d7c0d0542 /mesalib/src/mesa/main/state.h | |
| parent | b5acb643ab1a86b31409900a7c03281fcc48c8e3 (diff) | |
| parent | 9c17f511266fff48a936633de280f271f0ce0c11 (diff) | |
| download | vcxsrv-1923199a967ec1add54ad8c0e5d48ee320efdb9f.tar.gz vcxsrv-1923199a967ec1add54ad8c0e5d48ee320efdb9f.tar.bz2 vcxsrv-1923199a967ec1add54ad8c0e5d48ee320efdb9f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa git update 18 Mar 2013
fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar 2013
Diffstat (limited to 'mesalib/src/mesa/main/state.h')
| -rw-r--r-- | mesalib/src/mesa/main/state.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/state.h b/mesalib/src/mesa/main/state.h index 29a254092..7b3121b4e 100644 --- a/mesalib/src/mesa/main/state.h +++ b/mesalib/src/mesa/main/state.h @@ -66,7 +66,7 @@ _mesa_need_secondary_color(const struct gl_context *ctx) if (ctx->FragmentProgram._Current && (ctx->FragmentProgram._Current != ctx->FragmentProgram._TexEnvProgram) && - (ctx->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_COL1)) + (ctx->FragmentProgram._Current->Base.InputsRead & VARYING_BIT_COL1)) return GL_TRUE; return GL_FALSE; |