Title: [210731] trunk/Source/WebCore
- Revision
- 210731
- Author
- annu...@yandex.ru
- Date
- 2017-01-13 09:23:30 -0800 (Fri, 13 Jan 2017)
Log Message
Added preprocessor guard for iOS-specific piece of code in GraphicsContext3DOpenGL
https://bugs.webkit.org/show_bug.cgi?id=167005
Reviewed by Alex Christensen.
Variable "boundFrameBuffer" is used only in iOS-specific code
No new tests needed.
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
(WebCore::GraphicsContext3D::resolveMultisamplingIfNecessary):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210730 => 210731)
--- trunk/Source/WebCore/ChangeLog 2017-01-13 14:26:17 UTC (rev 210730)
+++ trunk/Source/WebCore/ChangeLog 2017-01-13 17:23:30 UTC (rev 210731)
@@ -1,3 +1,17 @@
+2017-01-13 Konstantin Tokarev <annu...@yandex.ru>
+
+ Added preprocessor guard for iOS-specific piece of code in GraphicsContext3DOpenGL
+ https://bugs.webkit.org/show_bug.cgi?id=167005
+
+ Reviewed by Alex Christensen.
+
+ Variable "boundFrameBuffer" is used only in iOS-specific code
+
+ No new tests needed.
+
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ (WebCore::GraphicsContext3D::resolveMultisamplingIfNecessary):
+
2017-01-13 Eric Carlson <eric.carl...@apple.com>
REGRESSION (r210621): [mac-wk2] LayoutTest fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled.html timing out
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (210730 => 210731)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2017-01-13 14:26:17 UTC (rev 210730)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2017-01-13 17:23:30 UTC (rev 210731)
@@ -227,8 +227,10 @@
TemporaryOpenGLSetting scopedDepth(GL_DEPTH_TEST, GL_FALSE);
TemporaryOpenGLSetting scopedStencil(GL_STENCIL_TEST, GL_FALSE);
+#if PLATFORM(IOS)
GLint boundFrameBuffer;
::glGetIntegerv(GL_FRAMEBUFFER_BINDING, &boundFrameBuffer);
+#endif
::glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
::glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
