commit 8b0f0b3b7af032bf6059828efb28380e2c091cc2
author Geoff Lang <geofflang@chromium.org> Mon Jul 20 15:59:28 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Mon Jul 20 20:59:06 2015 +0000
tree 020c542274c53c82e979c6a5ad662aec3e38498b
parent 951fffd3db0fffde87eea72ac84a0433ebac8d33

Add a profile mask member to the FunctionsGL structure.

BUG=angleproject:883

Change-Id: I3cdf88391e77a26a77e120de0fd32296a2b079d1
Reviewed-on: https://chromium-review.googlesource.com/286822
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/gl/FunctionsGL.cpp

diff --git a/src/libANGLE/renderer/gl/FunctionsGL.cpp b/src/libANGLE/renderer/gl/FunctionsGL.cpp
index 44a01b8..b60938a 100644
--- a/src/libANGLE/renderer/gl/FunctionsGL.cpp
+++ b/src/libANGLE/renderer/gl/FunctionsGL.cpp
@@ -773,12 +773,12 @@
 {
     // Grab the version number
     AssignGLEntryPoint(loadProcAddress("glGetString"), &getString);
+    AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
     GetGLVersion(getString, &version, &standard);
 
     // Grab the GL extensions
     if (isAtLeastGL(gl::Version(3, 0)))
     {
-        AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
         AssignGLEntryPoint(loadProcAddress("glGetStringi"), &getStringi);
         extensions = GetIndexedExtensions(getIntegerv, getStringi);
     }
@@ -788,6 +788,16 @@
         angle::SplitStringAlongWhitespace(std::string(exts), &extensions);
     }
 
+    // Check the context profile
+    if (isAtLeastGL(gl::Version(3, 2)))
+    {
+        getIntegerv(GL_CONTEXT_PROFILE_MASK, &profile);
+    }
+    else
+    {
+        profile = 0;
+    }
+
     // 1.0
     if (isAtLeastGL(gl::Version(1, 0)))
     {