aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glcpp/glcpp-parse.y
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-03 13:53:39 +0200
committermarha <marha@users.sourceforge.net>2013-10-03 13:53:39 +0200
commit7d29f4054380e7f42722c280b9caedce9fa4ace9 (patch)
tree4b8d3a482e5905f6efb32f5843f1c6fc75d4fe19 /mesalib/src/glsl/glcpp/glcpp-parse.y
parentc3594c6c050a987fb891a1c7cf0c83102fbbec46 (diff)
parent5593a3d2f370e3e12a043110bf2e395c938980d6 (diff)
downloadvcxsrv-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/glcpp/glcpp-parse.y')
-rw-r--r--mesalib/src/glsl/glcpp/glcpp-parse.y3
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y
index 6eaa5f95e..c7ad3e958 100644
--- a/mesalib/src/glsl/glcpp/glcpp-parse.y
+++ b/mesalib/src/glsl/glcpp/glcpp-parse.y
@@ -1248,6 +1248,9 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
if (extensions->EXT_shader_integer_mix)
add_builtin_define(parser, "GL_EXT_shader_integer_mix", 1);
+
+ if (extensions->ARB_texture_gather)
+ add_builtin_define(parser, "GL_ARB_texture_gather", 1);
}
}