Mesa (master): glsl: Parser handles " #extension GL_ARB_uniform_buffer_object"

Eric Anholt anholt at kemper.freedesktop.org
Mon Jul 9 19:45:08 UTC 2012


Module: Mesa
Branch: master
Commit: 7fabb2b5939c8640075136fec15d6b87bad9c9dd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7fabb2b5939c8640075136fec15d6b87bad9c9dd

Author: Vincent Lejeune <vljn at ovi.com>
Date:   Sun Dec 25 19:17:03 2011 +0100

glsl: Parser handles "#extension GL_ARB_uniform_buffer_object"

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/glsl_parser_extras.cpp |    1 +
 src/glsl/glsl_parser_extras.h   |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 02c3986..c19b6f9 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -296,6 +296,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
    EXT(OES_texture_3D,                 true,  false, true,  false, true,      EXT_texture3D),
    EXT(OES_EGL_image_external,         true,  false, true,  false, true,      OES_EGL_image_external),
    EXT(ARB_shader_bit_encoding,        true,  true,  true,  true,  false,     ARB_shader_bit_encoding),
+   EXT(ARB_uniform_buffer_object,      true,  false, true,  true,  false,     ARB_uniform_buffer_object),
 };
 
 #undef EXT
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index 246fc81..d97217e 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -207,6 +207,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. */




More information about the mesa-commit mailing list