Changeset 270103 in webkit

Timestamp:

Nov 20, 2020 3:48:29 AM (2 years ago)

Author:

Fujii Hironori

Message:

[TextureMapper] Hidden surface removal issue for nested transform-style:perserve-3d in Snow Stack demo
​https://bugs.webkit.org/show_bug.cgi?id=218969

Reviewed by Carlos Garcia Campos.

Source/WebCore:

r267711 enabled a depth buffer for a perserve-3d layer, but it
didn't work nicely for nested perserve-3d, for example Snow Stack
demo. It needs a intermediate surface to properly render
interchangeably nested perserve-3d and non perserve-3d layers, for
example transforms/3d/point-mapping/3d-point-mapping-deep.html.
This change supports only simply nested perserve-3d layers such
like Snow Stack demo.

• platform/graphics/texmap/TextureMapperLayer.cpp:

(WebCore::TextureMapperLayer::paintSelfAndChildren): Added
Preserves3DScope to call beginPreserves3D and endPreserves3D.

LayoutTests:

• platform/gtk/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png: Rebaselined.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png (modified) (previous)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-11-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TextureMapper] Hidden surface removal issue for nested transform-style:perserve-3d in Snow Stack demo
+        https://bugs.webkit.org/show_bug.cgi?id=218969
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png: Rebaselined.
+
 2020-11-20  Chris Lord  <clord@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TextureMapper] Hidden surface removal issue for nested transform-style:perserve-3d in Snow Stack demo
+        https://bugs.webkit.org/show_bug.cgi?id=218969
+
+        Reviewed by Carlos Garcia Campos.
+
+        r267711 enabled a depth buffer for a perserve-3d layer, but it
+        didn't work nicely for nested perserve-3d, for example Snow Stack
+        demo. It needs a intermediate surface to properly render
+        interchangeably nested perserve-3d and non perserve-3d layers, for
+        example transforms/3d/point-mapping/3d-point-mapping-deep.html.
+        This change supports only simply nested perserve-3d layers such
+        like Snow Stack demo.
+
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::paintSelfAndChildren): Added
+        Preserves3DScope to call beginPreserves3D and endPreserves3D.
+
 2020-11-20  Chris Lord  <clord@igalia.com>
 

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

@@ -41 +41 @@
     IntSize offset;
     TextureMapperLayer* backdropLayer { nullptr };
+    bool preserves3D { false };
 };
 
@@ -224 +225 @@
         return;
 
-    if (m_state.preserves3D)
-        options.textureMapper.beginPreserves3D();
+    struct Preserves3DScope {
+        Preserves3DScope(TextureMapperPaintOptions& passedOptions, bool passedEnable)
+            : options(passedOptions)
+            , enable(passedEnable)
+        {
+            if (enable) {
+                options.preserves3D = true;
+                options.textureMapper.beginPreserves3D();
+            }
+        }
+        ~Preserves3DScope()
+        {
+            if (enable) {
+                options.preserves3D = false;
+                options.textureMapper.endPreserves3D();
+            }
+        }
+        TextureMapperPaintOptions& options;
+        bool enable;
+    } scopedPreserves3D(options, m_state.preserves3D && !options.preserves3D);
 
     if (m_state.backdropLayer && !options.backdropLayer) {
@@ -239 +258 @@
     paintSelf(options);
 
-    if (m_children.isEmpty()) {
-        if (m_state.preserves3D)
-            options.textureMapper.endPreserves3D();
-        return;
-    }
+    if (m_children.isEmpty())
+        return;
 
     bool shouldClip = m_state.masksToBounds && !m_state.preserves3D;
@@ -267 +283 @@
     if (shouldClip)
         options.textureMapper.endClip();
-    if (m_state.preserves3D)
-        options.textureMapper.endPreserves3D();
 }