Changeset 126675 in webkit

Timestamp:

Aug 24, 2012 7:26:06 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Texmap] Move TextureMapperGL to use GraphicsContext3D
​https://bugs.webkit.org/show_bug.cgi?id=78672

Patch by Helder Correia <Helder Correia> on 2012-08-24
Reviewed by Noam Rosenthal.

Introducing a new GraphicsContext3D::texImage2DDirect() to allow
initialization of textures without allocation. The existing
textImage2D() refuses a null pixel buffer, and
texImage2DResourceSafe() allows it but performs memory
allocation and zeroes the bits. This was not fast enough for
BitmapTextureGL frequent setting up.

No new tests, refactoring.

• platform/graphics/GraphicsContext3D.h:

(GraphicsContext3D):

• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::texImage2D):

• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::texImage2DDirect):
(WebCore):

• platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:

(WebCore::GraphicsContext3D::texImage2D):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext3D.h (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (modified) (2 diffs)
• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-24  Helder Correia  <helder.correia@nokia.com>
+
+        [Texmap] Move TextureMapperGL to use GraphicsContext3D
+        https://bugs.webkit.org/show_bug.cgi?id=78672
+
+        Reviewed by Noam Rosenthal.
+
+        Introducing a new GraphicsContext3D::texImage2DDirect() to allow
+        initialization of textures without allocation. The existing
+        textImage2D() refuses a null pixel buffer, and
+        texImage2DResourceSafe() allows it but performs memory
+        allocation and zeroes the bits. This was not fast enough for
+        BitmapTextureGL frequent setting up.
+
+        No new tests, refactoring.
+
+        * platform/graphics/GraphicsContext3D.h:
+        (GraphicsContext3D):
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::texImage2D):
+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+        (WebCore::GraphicsContext3D::texImage2DDirect):
+        (WebCore):
+        * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+        (WebCore::GraphicsContext3D::texImage2D):
+
 2012-08-24  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -527 +527 @@
 #endif
 
+    // Equivalent to ::glTexImage2D(). Allows pixels==0 with no allocation.
+    void texImage2DDirect(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels);
+
     // Helper to texImage2D with pixel==0 case: pixels are initialized to 0.
     // Return true if no GL error is synthesized.

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

@@ -257 +257 @@
         return false;
     }
-    makeContextCurrent();
+
     GC3Denum openGLInternalFormat = internalformat;
     if (type == GL_FLOAT) {
@@ -266 +266 @@
     }
 
-    ::glTexImage2D(target, level, openGLInternalFormat, width, height, border, format, type, pixels);
+    texImage2DDirect(target, level, openGLInternalFormat, width, height, border, format, type, pixels);
     return true;
 }

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

@@ -1381 +1381 @@
 }
 
+void GraphicsContext3D::texImage2DDirect(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, const void* pixels)
+{
+    makeContextCurrent();
+    ::glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+}
+
 }
 

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

@@ -32 +32 @@
 
 #include "GraphicsContext3D.h"
+
 #include "Extensions3DOpenGLES.h"
 #include "IntRect.h"
@@ -202 +203 @@
         return false;
     }
-    makeContextCurrent();
-    ::glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+
+    texImage2DDirect(target, level, internalformat, width, height, border, format, type, pixels);
     return true;
 }