commit 464a6b8bb75ad7f2b284077c957ecf939f66b8c3
author Geoff Lang <geofflang@chromium.org> Mon Jun 15 21:25:28 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Mon Jun 15 21:25:42 2015 +0000
tree 13d0f8b10db37440ea8dbe45eeff2307b7a125d7
parent 588e7ed2f8d3cd54f9961fe946ceedc78a967d0d

Revert "Enable point sprites in StateManagerGL."

Speculative fix for failures on the AMD FYI bot.

This reverts commit 67e04be12dda07ac9b37798558e842f50bd42776.

Change-Id: Ia57e3c800a6ff9e81e31bf5b37a95e97460ceda4
Reviewed-on: https://chromium-review.googlesource.com/277681
Reviewed-by: Geoff Lang <geofflang@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 63179b4..44a01b8 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,16 +788,6 @@
         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)))
     {
@@ -821,6 +811,8 @@
         AssignGLEntryPoint(loadProcAddress("glGetDoublev"), &getDoublev);
         AssignGLEntryPoint(loadProcAddress("glGetError"), &getError);
         AssignGLEntryPoint(loadProcAddress("glGetFloatv"), &getFloatv);
+        AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
+        AssignGLEntryPoint(loadProcAddress("glGetString"), &getString);
         AssignGLEntryPoint(loadProcAddress("glGetTexImage"), &getTexImage);
         AssignGLEntryPoint(loadProcAddress("glGetTexLevelParameterfv"), &getTexLevelParameterfv);
         AssignGLEntryPoint(loadProcAddress("glGetTexLevelParameteriv"), &getTexLevelParameteriv);