Changeset 283308 in webkit

Timestamp:

Sep 30, 2021, 5:47:13 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

GraphicsContextGLAttributes::hasFenceSync should be a property of GraphicsContextGLOpenGL
​https://bugs.webkit.org/show_bug.cgi?id=230939

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2021-09-30
Reviewed by Antti Koivisto.

Move hasFenceSync from GraphicsContextGLAttributes to GraphicsContextGLOpenGL.

No new tests, a refactor.

• platform/graphics/GraphicsContextGLAttributes.h:
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:

(WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
(WebCore::GraphicsContextGLOpenGL::prepareForDisplay):

• platform/graphics/opengl/GraphicsContextGLOpenGL.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContextGLAttributes.h (modified) (1 diff)
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (modified) (2 diffs)
• platform/graphics/opengl/GraphicsContextGLOpenGL.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-30  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        GraphicsContextGLAttributes::hasFenceSync should be a property of GraphicsContextGLOpenGL
+        https://bugs.webkit.org/show_bug.cgi?id=230939
+
+        Reviewed by Antti Koivisto.
+
+        Move hasFenceSync from GraphicsContextGLAttributes to GraphicsContextGLOpenGL.
+
+        No new tests, a refactor.
+
+        * platform/graphics/GraphicsContextGLAttributes.h:
+        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+        (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+        (WebCore::GraphicsContextGLOpenGL::prepareForDisplay):
+        * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+
 2021-09-30  Youenn Fablet  <youenn@apple.com>
 

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

@@ -65 +65 @@
 #if PLATFORM(COCOA)
     bool useMetal { true };
-    bool hasFenceSync { false };
 #endif
 #if ENABLE(WEBXR)

trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm

@@ -357 +357 @@
     }
     if (contextAttributes().useMetal) {
-        // The implementation uses GLsync objects. Enable the functionality for WebGL 1.0 contexts
-        // that use OpenGL ES 2.0.
+        // GraphicsContextGLOpenGL uses sync objects to throttle display on Metal implementations.
+        // OpenGL sync objects are not signaling upon completion on Catalina-era drivers, so
+        // OpenGL cannot use this method of throttling. OpenGL drivers typically implement
+        // some sort of internal throttling.
         if (extensions.supports("GL_ARB_sync"_s)) {
-            attrs.hasFenceSync = true;
+            m_useFenceSyncForDisplayRateLimit = true;
             extensions.ensureEnabled("GL_ARB_sync"_s);
-            setContextAttributes(attrs);
         }
     }
@@ -839 +840 @@
     markLayerComposited();
 
-    if (contextAttributes().useMetal && contextAttributes().hasFenceSync) {
-        // OpenGL sync objects are not signaling upon completion on Catalina-era drivers.
-        // OpenGL drivers typically implement some sort of internal throttling.
+    if (m_useFenceSyncForDisplayRateLimit) {
         bool success = waitAndUpdateOldestFrame();
         UNUSED_VARIABLE(success); // FIXME: implement context lost.

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h

@@ -797 +797 @@
 #endif
 #if USE(ANGLE)
+    bool m_useFenceSyncForDisplayRateLimit = false;
     static constexpr size_t maxPendingFrames = 3;
     size_t m_oldestFrameCompletionFence { 0 };