Changeset 267711 in webkit

Timestamp:

Sep 28, 2020, 1:04:47 PM (6 years ago)

Author:

Fujii Hironori

Message:

[TextureMapper] Enable a depth buffer for preserve-3d
​https://bugs.webkit.org/show_bug.cgi?id=90078

Reviewed by Don Olmstead.

Source/WebCore:

Test: transforms/3d/general/preserve-3d.html

• platform/graphics/egl/GLContextEGL.cpp:

(WebCore::GLContextEGL::getEGLConfig):

• platform/graphics/texmap/TextureMapper.h:

(WebCore::TextureMapper::beginPreserves3D): Added a new virtual method.
(WebCore::TextureMapper::endPreserves3D): Ditto.

• platform/graphics/texmap/TextureMapperGL.cpp:

(WebCore::TextureMapperGL::beginPainting):
(WebCore::createProjectionMatrix): Swapped nearValue and farValue
so that the depth buffer works as expected.
(WebCore::TextureMapperGL::beginPreserves3D): Added.
(WebCore::TextureMapperGL::endPreserves3D): Ditto.

• platform/graphics/texmap/TextureMapperGL.h:
• platform/graphics/texmap/TextureMapperLayer.cpp:

(WebCore::TextureMapperLayer::paintSelfAndChildren): Call
beginPreserves3D() and endPreserves3D() if m_state.preserves3D.

LayoutTests:

• transforms/3d/general/preserve-3d-expected.html: Added.
• transforms/3d/general/preserve-3d.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/transforms/3d/general/preserve-3d-expected.html (added)
• LayoutTests/transforms/3d/general/preserve-3d.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapper.h (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-28  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TextureMapper] Enable a depth buffer for preserve-3d
+        https://bugs.webkit.org/show_bug.cgi?id=90078
+
+        Reviewed by Don Olmstead.
+
+        * transforms/3d/general/preserve-3d-expected.html: Added.
+        * transforms/3d/general/preserve-3d.html: Added.
+
 2020-09-28  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-28  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TextureMapper] Enable a depth buffer for preserve-3d
+        https://bugs.webkit.org/show_bug.cgi?id=90078
+
+        Reviewed by Don Olmstead.
+
+        Test: transforms/3d/general/preserve-3d.html
+
+        * platform/graphics/egl/GLContextEGL.cpp:
+        (WebCore::GLContextEGL::getEGLConfig):
+        * platform/graphics/texmap/TextureMapper.h:
+        (WebCore::TextureMapper::beginPreserves3D): Added a new virtual method.
+        (WebCore::TextureMapper::endPreserves3D): Ditto.
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+        (WebCore::TextureMapperGL::beginPainting):
+        (WebCore::createProjectionMatrix): Swapped nearValue and farValue
+        so that the depth buffer works as expected.
+        (WebCore::TextureMapperGL::beginPreserves3D): Added.
+        (WebCore::TextureMapperGL::endPreserves3D): Ditto.
+        * platform/graphics/texmap/TextureMapperGL.h:
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::paintSelfAndChildren): Call
+        beginPreserves3D() and endPreserves3D() if m_state.preserves3D.
+
 2020-09-28  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp

@@ -119 +119 @@
         EGL_STENCIL_SIZE, 8,
         EGL_SURFACE_TYPE, EGL_NONE,
+        EGL_DEPTH_SIZE, 8,
         EGL_NONE
     };

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

@@ -79 +79 @@
     virtual void endClip() = 0;
     virtual IntRect clipBounds() = 0;
+    virtual void beginPreserves3D() { };
+    virtual void endPreserves3D() { };
     virtual Ref<BitmapTexture> createTexture() = 0;
     virtual Ref<BitmapTexture> createTexture(int internalFormat) = 0;

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

@@ -202 +202 @@
     data().previousDepthState = glIsEnabled(GL_DEPTH_TEST);
     glDisable(GL_DEPTH_TEST);
+    glDepthFunc(GL_LEQUAL);
     glEnable(GL_SCISSOR_TEST);
     data().didModifyStencil = false;
-    glDepthMask(0);
     glGetIntegerv(GL_VIEWPORT, data().viewport);
     glGetIntegerv(GL_SCISSOR_BOX, data().previousScissor);
@@ -825 +825 @@
 static inline TransformationMatrix createProjectionMatrix(const IntSize& size, bool mirrored)
 {
-    const float nearValue = 9999999;
-    const float farValue = -99999;
+    const float nearValue = -99999;
+    const float farValue = 9999999;
 
     return TransformationMatrix(2.0 / float(size.width()), 0, 0, 0,
@@ -950 +950 @@
 }
 
+void TextureMapperGL::beginPreserves3D()
+{
+    glEnable(GL_DEPTH_TEST);
+    glClear(GL_DEPTH_BUFFER_BIT);
+}
+
+void TextureMapperGL::endPreserves3D()
+{
+    glDisable(GL_DEPTH_TEST);
+}
+
 Ref<BitmapTexture> TextureMapperGL::createTexture(GLint internalFormat)
 {

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

@@ -80 +80 @@
     void endPainting() override;
     void endClip() override;
+    void beginPreserves3D() override;
+    void endPreserves3D() override;
     IntRect clipBounds() override;
     IntSize maxTextureSize() const override { return IntSize(2000, 2000); }

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

@@ -223 +223 @@
         return;
 
+    if (m_state.preserves3D)
+        options.textureMapper.beginPreserves3D();
+
     if (m_state.backdropLayer && !options.backdropLayer) {
         TransformationMatrix clipTransform;
@@ -235 +238 @@
     paintSelf(options);
 
-    if (m_children.isEmpty())
-        return;
+    if (m_children.isEmpty()) {
+        if (m_state.preserves3D)
+            options.textureMapper.endPreserves3D();
+        return;
+    }
 
     bool shouldClip = m_state.masksToBounds && !m_state.preserves3D;
@@ -260 +266 @@
     if (shouldClip)
         options.textureMapper.endClip();
+    if (m_state.preserves3D)
+        options.textureMapper.endPreserves3D();
 }