Mesa (master): mesa: Support glGetString(GL_SHADING_LANGUAGE_VERSION) for > = 1.40.

Kenneth Graunke kwg at kemper.freedesktop.org
Tue Jul 31 17:52:59 UTC 2012


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Jul 26 15:54:25 2012 -0700

mesa: Support glGetString(GL_SHADING_LANGUAGE_VERSION) for >= 1.40.

This will need to get refactored when we add support for core profiles
or forward-compatible contexts, but we may as well have it in the
meantime.  This allows us to override the GLSL version and experiment.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/main/getstring.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index c6f400a..1734fb3 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -56,6 +56,16 @@ shading_language_version(struct gl_context *ctx)
          return (const GLubyte *) "1.30";
       case 140:
          return (const GLubyte *) "1.40";
+      case 150:
+         return (const GLubyte *) "1.50";
+      case 330:
+         return (const GLubyte *) "3.30";
+      case 400:
+         return (const GLubyte *) "4.00";
+      case 410:
+         return (const GLubyte *) "4.10";
+      case 420:
+         return (const GLubyte *) "4.20";
       default:
          _mesa_problem(ctx,
                        "Invalid GLSL version in shading_language_version()");




More information about the mesa-commit mailing list