diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-10 09:01:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-10 09:01:25 +0200 |
| commit | 889d7dd8e94a5538f388cc619115bf5c0b6fc0b7 (patch) | |
| tree | bdda17693281525be9d48886acf2dc89ac4c66b4 /mesalib/src/glsl/glsl_parser_extras.h | |
| parent | 2414a1de3cc17f438219f8f2a58b530d33e99a5e (diff) | |
| download | vcxsrv-889d7dd8e94a5538f388cc619115bf5c0b6fc0b7.tar.gz vcxsrv-889d7dd8e94a5538f388cc619115bf5c0b6fc0b7.tar.bz2 vcxsrv-889d7dd8e94a5538f388cc619115bf5c0b6fc0b7.zip | |
fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013
xserver commit 47ff382d1fce25a8b097d45b79489e891f1f1228
libxcb commit f1405d9fe4a6ddcae24585ba254389a4c4f4c8c9
libX11 commit cb107760df33ffc8630677e66e2e50aa37950a5c
libXmu commit 2539e539eafdac88177c8ee30b043c5d52f017e4
fontconfig commit a61e145304da86c8c35b137493bbd8fd5dd1e7f5
mesa commit 395b9410860371a64d6b5f2d50679f29eb41729e
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 440c15bb8..15abbbc99 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -113,7 +113,7 @@ struct _mesa_glsl_parse_state { * feature. */ bool is_version(unsigned required_glsl_version, - unsigned required_glsl_es_version) + unsigned required_glsl_es_version) const { unsigned required_version = this->es_shader ? required_glsl_es_version : required_glsl_version; @@ -315,6 +315,8 @@ struct _mesa_glsl_parse_state { bool AMD_vertex_shader_layer_warn; bool ARB_shading_language_420pack_enable; bool ARB_shading_language_420pack_warn; + bool MESA_shader_integer_mix_enable; + bool MESA_shader_integer_mix_warn; /*@}*/ /** Extensions supported by the OpenGL implementation. */ |