Changeset 80124 in webkit

Timestamp:

Mar 2, 2011 6:47:38 AM (13 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/55534> Clean up macros in Extensions3DOpenGL.cpp

Reviewed by Darin Adler.

Change "#if GL_APPLE_vertex_array_object" macros to check that
GL_APPLE_vertex_array_object is both defined and non-zero.

• platform/graphics/opengl/Extensions3DOpenGL.cpp:

(WebCore::Extensions3DOpenGL::createVertexArrayOES):
(WebCore::Extensions3DOpenGL::deleteVertexArrayOES): Remove
empty #else clause.
(WebCore::Extensions3DOpenGL::isVertexArrayOES):
(WebCore::Extensions3DOpenGL::bindVertexArrayOES): Add early
return check. Remove #else clause that would never have
compiled (since array is not a WTF::String).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/opengl/Extensions3DOpenGL.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-02  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/55534> Clean up macros in Extensions3DOpenGL.cpp
+
+        Reviewed by Darin Adler.
+
+        Change "#if GL_APPLE_vertex_array_object" macros to check that
+        GL_APPLE_vertex_array_object is both defined and non-zero.
+
+        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+        (WebCore::Extensions3DOpenGL::createVertexArrayOES):
+        (WebCore::Extensions3DOpenGL::deleteVertexArrayOES): Remove
+        empty #else clause.
+        (WebCore::Extensions3DOpenGL::isVertexArrayOES):
+        (WebCore::Extensions3DOpenGL::bindVertexArrayOES): Add early
+        return check.  Remove #else clause that would never have
+        compiled (since array is not a WTF::String).
+
 2011-03-01  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

@@ -135 +135 @@
 {
     m_context->makeContextCurrent();
-#if GL_APPLE_vertex_array_object
+#if defined GL_APPLE_vertex_array_object && GL_APPLE_vertex_array_object
     GLuint array = 0;
     glGenVertexArraysAPPLE(1, &array);
@@ -150 +150 @@
     
     m_context->makeContextCurrent();
-#if GL_APPLE_vertex_array_object
+#if defined GL_APPLE_vertex_array_object && GL_APPLE_vertex_array_object
     glDeleteVertexArraysAPPLE(1, &array);
-#else
 #endif
 }
@@ -162 +161 @@
     
     m_context->makeContextCurrent();
-#if GL_APPLE_vertex_array_object
+#if defined GL_APPLE_vertex_array_object && GL_APPLE_vertex_array_object
     return glIsVertexArrayAPPLE(array);
 #else
@@ -171 +170 @@
 void Extensions3DOpenGL::bindVertexArrayOES(Platform3DObject array)
 {
+    if (!array)
+        return;
+
     m_context->makeContextCurrent();
-#if GL_APPLE_vertex_array_object
+#if defined GL_APPLE_vertex_array_object && GL_APPLE_vertex_array_object
     glBindVertexArrayAPPLE(array);
-#else
-    ASSERT_UNUSED(array, supports(array));
 #endif
 }