Title: [223642] branches/safari-604-branch
- Revision
- 223642
- Author
- [email protected]
- Date
- 2017-10-18 16:59:42 -0700 (Wed, 18 Oct 2017)
Log Message
Cherry-pick r223640. rdar://problem/35063901
Modified Paths
Diff
Modified: branches/safari-604-branch/LayoutTests/ChangeLog (223641 => 223642)
--- branches/safari-604-branch/LayoutTests/ChangeLog 2017-10-18 23:52:38 UTC (rev 223641)
+++ branches/safari-604-branch/LayoutTests/ChangeLog 2017-10-18 23:59:42 UTC (rev 223642)
@@ -1,3 +1,19 @@
+2017-10-18 Dean Jackson <[email protected]>
+
+ Cherry-pick r223640. rdar://problem/35063901
+
+ 2017-10-18 Dean Jackson <[email protected]>
+
+ Some older hardware can't actually use renderbuffers at the size they advertise
+ https://bugs.webkit.org/show_bug.cgi?id=178417
+ <rdar://problem/35042291>
+
+ Reviewed by Tim Horton.
+
+ Unskip webgl/1.0.2/conformance/canvas/drawingbuffer-static-canvas-test.html.
+
+ * TestExpectations:
+
2017-10-17 Dean Jackson <[email protected]>
Cherry-pick r223567. rdar://problem/35041476
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (223641 => 223642)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-18 23:52:38 UTC (rev 223641)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-10-18 23:59:42 UTC (rev 223642)
@@ -1,3 +1,24 @@
+2017-10-18 Dean Jackson <[email protected]>
+
+ Cherry-pick r223640. rdar://problem/35063901
+
+ 2017-10-18 Dean Jackson <[email protected]>
+
+ Some older hardware can't actually use renderbuffers at the size they advertise
+ https://bugs.webkit.org/show_bug.cgi?id=178417
+ <rdar://problem/35042291>
+
+ Reviewed by Tim Horton.
+
+ The change in r223567 caused some older hardware to fail, because even though
+ they claimed to support a maximum renderbuffer and viewport of 16K, they were
+ unable to actually handle one. Rather than trying to identify such hardware,
+ clamp all buffers to a maximum of 8192. This is bigger than the previous value
+ of 4096, and large enough to have a full-screen buffer on a Retina 5K iMac.
+
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ (WebCore::GraphicsContext3D::getIntegerv):
+
2017-10-17 Dean Jackson <[email protected]>
Cherry-pick r223567. rdar://problem/35041476
Modified: branches/safari-604-branch/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (223641 => 223642)
--- branches/safari-604-branch/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2017-10-18 23:52:38 UTC (rev 223641)
+++ branches/safari-604-branch/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2017-10-18 23:59:42 UTC (rev 223642)
@@ -333,6 +333,20 @@
if (getExtensions().requiresRestrictedMaximumTextureSize())
*value = std::min(1024, *value);
break;
+#if PLATFORM(MAC)
+ // Some older hardware advertises a larger maximum than they
+ // can actually handle. Rather than detecting such devices, simply
+ // clamp the maximum to 8192, which is big enough for a 5K display.
+ case MAX_RENDERBUFFER_SIZE:
+ ::glGetIntegerv(MAX_RENDERBUFFER_SIZE, value);
+ *value = std::min(8192, *value);
+ break;
+ case MAX_VIEWPORT_DIMS:
+ ::glGetIntegerv(MAX_VIEWPORT_DIMS, value);
+ value[0] = std::min(8192, value[0]);
+ value[1] = std::min(8192, value[1]);
+ break;
+#endif
default:
::glGetIntegerv(pname, value);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
