OpenGLShims: fix check for ANGLE GLES2 extensions
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Mar 2013 15:54:34 +0000 (15:54 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Mar 2013 15:54:34 +0000 (15:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=111656

Patch by Sergio Correia <sergio.correia@openbossa.org> on 2013-03-07
Reviewed by Simon Hausmann.

The check for ANGLE GLES2 extensions is currently being overriden
with checks for APPLE extensions in lookupOpenGLFunctionAddress().

No new tests. No user visible behavior changed.

* platform/graphics/OpenGLShims.cpp:
(WebCore::lookupOpenGLFunctionAddress):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145079 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/OpenGLShims.cpp

index cc6b5c4..2638c9f 100644 (file)
@@ -1,3 +1,18 @@
+2013-03-07  Sergio Correia  <sergio.correia@openbossa.org>
+
+        OpenGLShims: fix check for ANGLE GLES2 extensions
+        https://bugs.webkit.org/show_bug.cgi?id=111656
+
+        Reviewed by Simon Hausmann.
+
+        The check for ANGLE GLES2 extensions is currently being overriden
+        with checks for APPLE extensions in lookupOpenGLFunctionAddress().
+
+        No new tests. No user visible behavior changed.
+
+        * platform/graphics/OpenGLShims.cpp:
+        (WebCore::lookupOpenGLFunctionAddress):
+
 2013-03-07  David Kilzer  <ddkilzer@apple.com>
 
         Rename visible_units.h to VisibleUnits.h in WebCore.vcxproj.filters
index 73ef43d..ca32862 100644 (file)
@@ -84,6 +84,8 @@ static void* lookupOpenGLFunctionAddress(const char* functionName, bool* success
     fullFunctionName = functionName;
     fullFunctionName.append("ANGLE");
     target = getProcAddress(fullFunctionName.utf8().data());
+    if (target)
+        return target;
 
     fullFunctionName = functionName;
     fullFunctionName.append("APPLE");