diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /mesalib/src/mesa/program/program_parse_extra.c | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'mesalib/src/mesa/program/program_parse_extra.c')
| -rw-r--r-- | mesalib/src/mesa/program/program_parse_extra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/program/program_parse_extra.c b/mesalib/src/mesa/program/program_parse_extra.c index a9e364045..32b54afc5 100644 --- a/mesalib/src/mesa/program/program_parse_extra.c +++ b/mesalib/src/mesa/program/program_parse_extra.c @@ -40,7 +40,7 @@ _mesa_parse_instruction_suffix(const struct asm_parser_state *state, { inst->CondUpdate = 0; inst->CondDst = 0; - inst->SaturateMode = SATURATE_OFF; + inst->Saturate = GL_FALSE; inst->Precision = FLOAT32; @@ -82,7 +82,7 @@ _mesa_parse_instruction_suffix(const struct asm_parser_state *state, */ if (state->mode == ARB_fragment) { if (strcmp(suffix, "_SAT") == 0) { - inst->SaturateMode = SATURATE_ZERO_ONE; + inst->Saturate = GL_TRUE; suffix += 4; } } |