Title: [180614] trunk/Source/WebCore
- Revision
- 180614
- Author
- rn...@webkit.org
- Date
- 2015-02-24 21:11:36 -0800 (Tue, 24 Feb 2015)
Log Message
Unreviewed Mavericks build attempt fix after r180609.
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D):
(WebCore::GraphicsContext3D::checkGPUStatusIfNecessary):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (180613 => 180614)
--- trunk/Source/WebCore/ChangeLog 2015-02-25 04:53:44 UTC (rev 180613)
+++ trunk/Source/WebCore/ChangeLog 2015-02-25 05:11:36 UTC (rev 180614)
@@ -1,3 +1,11 @@
+2015-02-24 Ryosuke Niwa <rn...@webkit.org>
+
+ Unreviewed Mavericks build attempt fix after r180609.
+
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+ (WebCore::GraphicsContext3D::checkGPUStatusIfNecessary):
+
2015-02-19 Roger Fong <roger_f...@apple.com>
WebGL: Destroy the GLContext if a GPU restart has been detected.
Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (180613 => 180614)
--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2015-02-25 04:53:44 UTC (rev 180613)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2015-02-25 05:11:36 UTC (rev 180614)
@@ -63,10 +63,14 @@
namespace WebCore {
+#define USE_GPU_STATUS_CHECK ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS))
+
const int maxActiveContexts = 64;
int GraphicsContext3D::numActiveContexts = 0;
+#if USE_GPU_STATUS_CHECK
const int GPUStatusCheckThreshold = 5;
int GraphicsContext3D::GPUCheckCounter = 0;
+#endif
// FIXME: This class is currently empty on Mac, but will get populated as
// the restructuring in https://bugs.webkit.org/show_bug.cgi?id=66903 is done
@@ -201,7 +205,7 @@
return;
CGLError err = CGLCreateContext(pixelFormatObj, 0, &m_contextObj);
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS))
+#if USE_GPU_STATUS_CHECK
GLint abortOnBlacklist = 0;
#if PLATFORM(MAC)
CGLSetParameter(m_contextObj, kCGLCPAbortOnGPURestartStatusBlacklisted, &abortOnBlacklist);
@@ -369,7 +373,7 @@
void GraphicsContext3D::checkGPUStatusIfNecessary()
{
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS))
+#if USE_GPU_STATUS_CHECK
GPUCheckCounter = (GPUCheckCounter + 1) % GPUStatusCheckThreshold;
if (GPUCheckCounter)
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
