commit e2865d029b5cd80f8d1429fc71a6cd8501d14461
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:06:01 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:06:01 2013 +0000
tree b50022e8ada85b2a3a108ab43546ddb9c4f64b90
parent 302df74cc22fdf426334aebd9dbad4d7b3df5be2

Return correct GL version and GLSL ES version strings when we are running in an ES3 context.

TRAC #22865

Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2297 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index d3b82fa..a76dca8 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -4393,9 +4393,23 @@
           case GL_RENDERER:
             return (GLubyte*)((context != NULL) ? context->getRendererString() : "ANGLE");
           case GL_VERSION:
-            return (GLubyte*)"OpenGL ES 2.0 (ANGLE " VERSION_STRING ")";
+            if (context->getClientVersion() == 2)
+            {
+                return (GLubyte*)"OpenGL ES 2.0 (ANGLE " VERSION_STRING ")";
+            }
+            else
+            {
+                return (GLubyte*)"OpenGL ES 3.0 (ANGLE " VERSION_STRING ")";
+            }
           case GL_SHADING_LANGUAGE_VERSION:
-            return (GLubyte*)"OpenGL ES GLSL ES 1.00 (ANGLE " VERSION_STRING ")";
+            if (context->getClientVersion() == 2)
+            {
+                return (GLubyte*)"OpenGL ES GLSL ES 1.00 (ANGLE " VERSION_STRING ")";
+            }
+            else
+            {
+                return (GLubyte*)"OpenGL ES GLSL ES 3.00 (ANGLE " VERSION_STRING ")";
+            }
           case GL_EXTENSIONS:
             return (GLubyte*)((context != NULL) ? context->getCombinedExtensionsString() : "");
           default: