diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-27 06:58:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-27 06:58:32 +0000 |
| commit | 96d6df5da9cddedf4931bf8e17f96e242467c661 (patch) | |
| tree | 07977c913b04e80b7dbd302e7a5890422aeacb1b /mesalib/src/mesa/program/program_parse.y | |
| parent | 71372d36e1a3f0230b88808f70d35446fda12260 (diff) | |
| download | vcxsrv-96d6df5da9cddedf4931bf8e17f96e242467c661.tar.gz vcxsrv-96d6df5da9cddedf4931bf8e17f96e242467c661.tar.bz2 vcxsrv-96d6df5da9cddedf4931bf8e17f96e242467c661.zip | |
xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011
Diffstat (limited to 'mesalib/src/mesa/program/program_parse.y')
| -rw-r--r-- | mesalib/src/mesa/program/program_parse.y | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mesalib/src/mesa/program/program_parse.y b/mesalib/src/mesa/program/program_parse.y index b35bc5a7c..85c783dd6 100644 --- a/mesalib/src/mesa/program/program_parse.y +++ b/mesalib/src/mesa/program/program_parse.y @@ -2060,9 +2060,14 @@ resultColBinding: COLOR optResultFaceType optResultColorType optResultFaceType: { - $$ = (state->mode == ARB_vertex) - ? VERT_RESULT_COL0 - : FRAG_RESULT_COLOR; + if (state->mode == ARB_vertex) { + $$ = VERT_RESULT_COL0; + } else { + if (state->option.DrawBuffers) + $$ = FRAG_RESULT_DATA0; + else + $$ = FRAG_RESULT_COLOR; + } } | '[' INTEGER ']' { |