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

Return correct GL version and GLSL ES version strings when we are running in an ES3 context.
e2865d02 · shannonwoods@chromium.org · 302df74c · e2865d02
Commit e2865d02 authored May 30, 2013 by shannonwoods@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 2 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +16 -2

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -4393,9 +4393,23 @@ const GLubyte* __stdcall glGetString(GLenum name)
          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: