[iOS] Multisampling is not available on iOS
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 13:02:49 +0000 (13:02 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 13:02:49 +0000 (13:02 +0000)
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm

index 0dbb1a230273dbf637d873c116c249ffc6575a17..cf4ca2471f681129f4b32aaf1351f8b08c9b919c 100644 (file)
@@ -1,3 +1,10 @@
+2014-01-11  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Multisampling is not available on iOS
+
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2014-01-10  David Kilzer  <ddkilzer@apple.com>
 
         [iOS] Fix build for HTMLImageElement::willRespondToMouseClickEvents()
index e44a13f4a57083ea9d7b7303a3ad1e26b1dd6786..422831240d67b82b0cda781299cf6f2f1248fb0a 100644 (file)
@@ -218,9 +218,11 @@ GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWi
 #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 @@ GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWi
     ::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);