Changeset 220400 in webkit

Timestamp:

Aug 8, 2017 6:05:22 AM (7 years ago)

Author:

zandobersek@gmail.com

Message:

[TexMap] Drop GC3D* type usage from TextureMapperPlatformLayer{Buffer,Proxy}
​https://bugs.webkit.org/show_bug.cgi?id=175314

Reviewed by Carlos Garcia Campos.

Switch to using OpenGL types in the TextureMapperPlatformLayerBuffer and
TextureMapperPlatformLayerProxy classes, instead of the equivalent GC3D*
types provided in the GraphicsTypes3D.h header.

No new tests -- no change in behavior.

• platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp:

(WebCore::TextureMapperPlatformLayerBuffer::TextureMapperPlatformLayerBuffer):
(WebCore::TextureMapperPlatformLayerBuffer::canReuseWithoutReset):

• platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
• platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp:

(WebCore::TextureMapperPlatformLayerProxy::getAvailableBuffer):

• platform/graphics/texmap/TextureMapperPlatformLayerProxy.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp (modified) (2 diffs)
• platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h (modified) (4 diffs)
• platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp (modified) (1 diff)
• platform/graphics/texmap/TextureMapperPlatformLayerProxy.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-08  Zan Dobersek  <zdobersek@igalia.com>
+
+        [TexMap] Drop GC3D* type usage from TextureMapperPlatformLayer{Buffer,Proxy}
+        https://bugs.webkit.org/show_bug.cgi?id=175314
+
+        Reviewed by Carlos Garcia Campos.
+
+        Switch to using OpenGL types in the TextureMapperPlatformLayerBuffer and
+        TextureMapperPlatformLayerProxy classes, instead of the equivalent GC3D*
+        types provided in the GraphicsTypes3D.h header.
+
+        No new tests -- no change in behavior.
+
+        * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp:
+        (WebCore::TextureMapperPlatformLayerBuffer::TextureMapperPlatformLayerBuffer):
+        (WebCore::TextureMapperPlatformLayerBuffer::canReuseWithoutReset):
+        * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
+        * platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp:
+        (WebCore::TextureMapperPlatformLayerProxy::getAvailableBuffer):
+        * platform/graphics/texmap/TextureMapperPlatformLayerProxy.h:
+
 2017-08-08  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp

@@ -39 +39 @@
 }
 
-TextureMapperPlatformLayerBuffer::TextureMapperPlatformLayerBuffer(GLuint textureID, const IntSize& size, TextureMapperGL::Flags flags, GC3Dint internalFormat)
+TextureMapperPlatformLayerBuffer::TextureMapperPlatformLayerBuffer(GLuint textureID, const IntSize& size, TextureMapperGL::Flags flags, GLint internalFormat)
     : m_textureID(textureID)
     , m_size(size)
@@ -48 +48 @@
 }
 
-bool TextureMapperPlatformLayerBuffer::canReuseWithoutReset(const IntSize& size, GC3Dint internalFormat)
+bool TextureMapperPlatformLayerBuffer::canReuseWithoutReset(const IntSize& size, GLint internalFormat)
 {
-    return m_texture && (m_texture->size() == size) && (static_cast<BitmapTextureGL*>(m_texture.get())->internalFormat() == internalFormat || internalFormat == GraphicsContext3D::DONT_CARE);
+    return m_texture && (m_texture->size() == size) && (static_cast<BitmapTextureGL*>(m_texture.get())->internalFormat() == internalFormat || internalFormat == GL_DONT_CARE);
 }
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h

@@ -27 +27 @@
 
 #include "BitmapTextureGL.h"
-#include "GraphicsTypes3D.h"
+#include "TextureMapperGLHeaders.h"
 #include "TextureMapperPlatformLayer.h"
 #include <wtf/CurrentTime.h>
@@ -40 +40 @@
 public:
     TextureMapperPlatformLayerBuffer(RefPtr<BitmapTexture>&&, TextureMapperGL::Flags = 0);
-    TextureMapperPlatformLayerBuffer(GLuint textureID, const IntSize&, TextureMapperGL::Flags, GC3Dint internalFormat);
+    TextureMapperPlatformLayerBuffer(GLuint textureID, const IntSize&, TextureMapperGL::Flags, GLint internalFormat);
 
     virtual ~TextureMapperPlatformLayerBuffer() = default;
@@ -46 +46 @@
     void paintToTextureMapper(TextureMapper&, const FloatRect&, const TransformationMatrix& modelViewMatrix = TransformationMatrix(), float opacity = 1.0) final;
 
-    bool canReuseWithoutReset(const IntSize&, GC3Dint internalFormat);
+    bool canReuseWithoutReset(const IntSize&, GLint internalFormat);
     BitmapTextureGL& textureGL() { return static_cast<BitmapTextureGL&>(*m_texture); }
 
@@ -73 +73 @@
     GLuint m_textureID;
     IntSize m_size;
-    GC3Dint m_internalFormat;
+    GLint m_internalFormat;
     TextureMapperGL::Flags m_extraFlags;
     bool m_hasManagedTexture;

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp

@@ -118 +118 @@
 }
 
-std::unique_ptr<TextureMapperPlatformLayerBuffer> TextureMapperPlatformLayerProxy::getAvailableBuffer(const IntSize& size, GC3Dint internalFormat)
+std::unique_ptr<TextureMapperPlatformLayerBuffer> TextureMapperPlatformLayerProxy::getAvailableBuffer(const IntSize& size, GLint internalFormat)
 {
     ASSERT(m_lock.isHeld());

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h

@@ -29 +29 @@
 #if USE(COORDINATED_GRAPHICS_THREADED)
 
-#include "GraphicsTypes3D.h"
+#include "TextureMapperGLHeaders.h"
 #include <wtf/Function.h>
 #include <wtf/Lock.h>
@@ -63 +63 @@
     // aquire / release the lock explicitly to use below methods.
     Lock& lock() { return m_lock; }
-    std::unique_ptr<TextureMapperPlatformLayerBuffer> getAvailableBuffer(const IntSize&, GC3Dint internalFormat);
+    std::unique_ptr<TextureMapperPlatformLayerBuffer> getAvailableBuffer(const IntSize&, GLint internalFormat);
     void pushNextBuffer(std::unique_ptr<TextureMapperPlatformLayerBuffer>);
     bool isActive();