Title: [161759] trunk/Source/WebCore
- Revision
- 161759
- Author
- [email protected]
- Date
- 2014-01-11 05:02:49 -0800 (Sat, 11 Jan 2014)
Log Message
[iOS] Multisampling is not available on iOS
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161758 => 161759)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 08:52:01 UTC (rev 161758)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 13:02:49 UTC (rev 161759)
@@ -1,3 +1,10 @@
+2014-01-11 David Kilzer <[email protected]>
+
+ [iOS] Multisampling is not available on iOS
+
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+
2014-01-10 David Kilzer <[email protected]>
[iOS] Fix build for HTMLImageElement::willRespondToMouseClickEvents()
Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (161758 => 161759)
--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-01-11 08:52:01 UTC (rev 161758)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-01-11 13:02:49 UTC (rev 161759)
@@ -218,9 +218,11 @@
#endif
END_BLOCK_OBJC_EXCEPTIONS
+#if !PLATFORM(IOS)
if (useMultisampling)
::glEnable(GL_MULTISAMPLE);
-
+#endif
+
#if PLATFORM(IOS)
::glGenRenderbuffers(1, &m_texture);
#else
@@ -239,11 +241,11 @@
::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
::glBindTexture(GL_TEXTURE_2D, 0);
#endif
-
+
// create an FBO
::glGenFramebuffersEXT(1, &m_fbo);
::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
-
+
m_state.boundFBO = m_fbo;
if (!m_attrs.antialias && (m_attrs.stencil || m_attrs.depth))
::glGenRenderbuffersEXT(1, &m_depthStencilBuffer);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
