diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
| commit | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (patch) | |
| tree | 21e1af7ee94600e349ae21353dc11963a06e988d /mesalib/src/glsl/glsl_parser_extras.h | |
| parent | 75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (diff) | |
| parent | d137057fd13e83ec15ab416c7fe774741da06047 (diff) | |
| download | vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.gz vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.bz2 vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/shm.c
xorg-server/Xext/sync.c
xorg-server/Xext/xf86bigfont.c
xorg-server/Xi/opendev.c
xorg-server/dix/dispatch.c
xorg-server/include/globals.h
xorg-server/mi/miinitext.c
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
| -rw-r--r-- | 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 b6dfbd07b..2564e5856 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -211,6 +211,8 @@ struct _mesa_glsl_parse_state { bool OES_EGL_image_external_warn; bool ARB_shader_bit_encoding_enable; bool ARB_shader_bit_encoding_warn; + bool ARB_uniform_buffer_object_enable; + bool ARB_uniform_buffer_object_warn; /*@}*/ /** Extensions supported by the OpenGL implementation. */ |