diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
| commit | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (patch) | |
| tree | 4b8d3a482e5905f6efb32f5843f1c6fc75d4fe19 /mesalib/src/glsl/glsl_parser_extras.h | |
| parent | c3594c6c050a987fb891a1c7cf0c83102fbbec46 (diff) | |
| parent | 5593a3d2f370e3e12a043110bf2e395c938980d6 (diff) | |
| download | vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.gz vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.bz2 vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config git update 3 Oct 2003
Conflicts:
xorg-server/xkeyboard-config/symbols/level3
xorg-server/xkeyboard-config/symbols/level5
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
| -rwxr-xr-x | mesalib/src/glsl/glsl_parser_extras.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 4833436a3..5c3733d6e 100755 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -278,6 +278,8 @@ struct _mesa_glsl_parse_state { bool ARB_fragment_coord_conventions_warn; bool ARB_texture_rectangle_enable; bool ARB_texture_rectangle_warn; + bool ARB_texture_gather_enable; + bool ARB_texture_gather_warn; bool EXT_texture_array_enable; bool EXT_texture_array_warn; bool ARB_shader_texture_lod_enable; |