Mesa (master): glsl: Incorporate all UBO language changes into GLSL 1.40.

Eric Anholt anholt at kemper.freedesktop.org
Tue Jul 31 19:21:41 UTC 2012


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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jun 18 16:47:04 2012 -0700

glsl: Incorporate all UBO language changes into GLSL 1.40.

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

---

 src/glsl/glsl_parser.yy |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index d44ec50..b7e1a5b 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -298,6 +298,10 @@ version_statement:
 			       state->version_string,
 			       state->supported_version_string);
 	   }
+
+	   if (state->language_version >= 140) {
+	      state->ARB_uniform_buffer_object_enable = true;
+	   }
 	}
 	;
 




More information about the mesa-commit mailing list