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/glsl/ir.cpp | |
| 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/glsl/ir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index 2eb3af695..60ef8b95a 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -1553,7 +1553,7 @@ ir_variable::determine_interpolation_mode(bool flat_shade) return (glsl_interp_qualifier) this->interpolation; int location = this->location; bool is_gl_Color = - location == FRAG_ATTRIB_COL0 || location == FRAG_ATTRIB_COL1; + location == VARYING_SLOT_COL0 || location == VARYING_SLOT_COL1; if (flat_shade && is_gl_Color) return INTERP_QUALIFIER_FLAT; else |