Changeset 252055 in webkit

Timestamp:

Nov 5, 2019 8:52:31 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Enable powerPreference controlled GPU switching with ANGLE
​https://bugs.webkit.org/show_bug.cgi?id=203773

GPU switching can't be controlled from within ANGLE running in the content process
due to sandbox restrictions. So we need to continue using the existing
HighPerformanceGPUManager path with ANGLE.

Although the high power GPU is activated on request with this change, ANGLE does
not use it yet.

Patch by James Darpinian <James Darpinian> on 2019-11-05
Reviewed by Alex Christensen.

• platform/graphics/GraphicsContext3D.cpp:
• platform/graphics/GraphicsContext3D.h:
• platform/graphics/GraphicsContext3DManager.cpp:

(WebCore::GraphicsContext3DManager::updateHighPerformanceState):
(WebCore::GraphicsContext3DManager::disableHighPerformanceGPUTimerFired):

• platform/graphics/cocoa/GraphicsContext3DCocoa.mm:

(WebCore::GraphicsContext3D::GraphicsContext3D):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext3D.cpp (modified) (1 diff)
• platform/graphics/GraphicsContext3D.h (modified) (1 diff)
• platform/graphics/GraphicsContext3DManager.cpp (modified) (3 diffs)
• platform/graphics/cocoa/GraphicsContext3DCocoa.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-05  James Darpinian  <jdarpinian@chromium.org>
+
+        Enable powerPreference controlled GPU switching with ANGLE
+        https://bugs.webkit.org/show_bug.cgi?id=203773
+
+        GPU switching can't be controlled from within ANGLE running in the content process
+        due to sandbox restrictions. So we need to continue using the existing
+        HighPerformanceGPUManager path with ANGLE.
+
+        Although the high power GPU is activated on request with this change, ANGLE does
+        not use it yet.
+
+        Reviewed by Alex Christensen.
+
+        * platform/graphics/GraphicsContext3D.cpp:
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/GraphicsContext3DManager.cpp:
+        (WebCore::GraphicsContext3DManager::updateHighPerformanceState):
+        (WebCore::GraphicsContext3DManager::disableHighPerformanceGPUTimerFired):
+        * platform/graphics/cocoa/GraphicsContext3DCocoa.mm:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2019-11-05  youenn fablet  <youenn@apple.com>
 

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

@@ -657 +657 @@
 }
 
-#if !(PLATFORM(COCOA) && USE(OPENGL))
+#if !(PLATFORM(COCOA) && (USE(OPENGL) || USE(ANGLE)))
 void GraphicsContext3D::setContextVisibility(bool)
 {

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

@@ -1568 +1568 @@
 #endif
 
-#if PLATFORM(COCOA) && USE(OPENGL)
+#if PLATFORM(COCOA) && (USE(OPENGL) || USE(ANGLE))
     bool m_hasSwitchedToHighPerformanceGPU { false };
 #endif

trunk/Source/WebCore/platform/graphics/GraphicsContext3DManager.cpp

@@ -36 +36 @@
 #endif
 
-#if PLATFORM(MAC) && USE(OPENGL)
+#if PLATFORM(MAC) && (USE(OPENGL) || USE(ANGLE))
 #include "SwitchingGPUClient.h"
 #include <OpenGL/OpenGL.h>
@@ -223 +223 @@
 void GraphicsContext3DManager::updateHighPerformanceState()
 {
-#if PLATFORM(MAC) && USE(OPENGL)
+#if PLATFORM(MAC) && (USE(OPENGL) || USE(ANGLE))
     if (!hasLowAndHighPowerGPUs())
         return;
@@ -263 +263 @@
 
     m_requestingHighPerformance = false;
-#if PLATFORM(MAC) && USE(OPENGL)
+#if PLATFORM(MAC) && (USE(OPENGL) || USE(ANGLE))
     SwitchingGPUClient::singleton().releaseHighPerformanceGPU();
 #endif

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

@@ -179 +179 @@
 }
 
-#endif // PLATFORM(MAC) && USE(OPENGL)
+#endif // PLATFORM(MAC) && (USE(OPENGL) || USE(ANGLE))
 
 GraphicsContext3D::GraphicsContext3D(GraphicsContext3DAttributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle, GraphicsContext3D* sharedContext)
@@ -185 +185 @@
     , m_private(makeUnique<GraphicsContext3DPrivate>(this))
 {
+
+#if HAVE(APPLE_GRAPHICS_CONTROL)
+    m_powerPreferenceUsedForCreation = (hasLowAndHighPowerGPUs() && attrs.powerPreference == GraphicsContext3DPowerPreference::HighPerformance) ? GraphicsContext3DPowerPreference::HighPerformance : GraphicsContext3DPowerPreference::Default;
+#else
+    m_powerPreferenceUsedForCreation = GraphicsContext3DPowerPreference::Default;
+#endif
+
 #if !USE(ANGLE)
 #if USE(OPENGL_ES)
@@ -209 +216 @@
         ::glEnable(GraphicsContext3D::PRIMITIVE_RESTART_FIXED_INDEX);
 #elif USE(OPENGL)
-
-#if HAVE(APPLE_GRAPHICS_CONTROL)
-    m_powerPreferenceUsedForCreation = (hasLowAndHighPowerGPUs() && attrs.powerPreference == GraphicsContext3DPowerPreference::HighPerformance) ? GraphicsContext3DPowerPreference::HighPerformance : GraphicsContext3DPowerPreference::Default;
-#else
-    m_powerPreferenceUsedForCreation = GraphicsContext3DPowerPreference::Default;
-#endif
 
     bool useMultisampling = m_attrs.antialias;
@@ -700 +701 @@
 }
 
+#endif // USE(OPENGL)
+
+#if USE(OPENGL) || USE(ANGLE)
 void GraphicsContext3D::setContextVisibility(bool isVisible)
 {
@@ -709 +713 @@
     }
 }
-#endif // USE(OPENGL)
+#endif // USE(OPENGL) || USE(ANGLE)
 
 #if USE(ANGLE)