From 49dd0011b04badbde41cee9e9aa45fc0e9007fc4 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 16 Sep 2014 17:49:30 +0100 Subject: [PATCH] Updates for iOS GL calls in iOS8 --- modules/juce_opengl/native/juce_OpenGL_ios.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/juce_opengl/native/juce_OpenGL_ios.h b/modules/juce_opengl/native/juce_OpenGL_ios.h index f4d7277ed2..269fccd895 100644 --- a/modules/juce_opengl/native/juce_OpenGL_ios.h +++ b/modules/juce_opengl/native/juce_OpenGL_ios.h @@ -144,9 +144,14 @@ public: { if (useMSAA) { - glBindFramebuffer (GL_DRAW_FRAMEBUFFER_APPLE, frameBufferHandle); - glBindFramebuffer (GL_READ_FRAMEBUFFER_APPLE, msaaBufferHandle); + glBindFramebuffer (GL_DRAW_FRAMEBUFFER, frameBufferHandle); + glBindFramebuffer (GL_READ_FRAMEBUFFER, msaaBufferHandle); + + #if defined (__IPHONE_8_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0 + glResolveMultisampleFramebuffer(); + #else glResolveMultisampleFramebufferAPPLE(); + #endif } glBindRenderbuffer (GL_RENDERBUFFER, colorBufferHandle); @@ -240,7 +245,7 @@ private: glBindFramebuffer (GL_FRAMEBUFFER, msaaBufferHandle); glBindRenderbuffer (GL_RENDERBUFFER, msaaColorHandle); - glRenderbufferStorageMultisample (GL_RENDERBUFFER, 4, GL_RGBA8_OES, width, height); + glRenderbufferStorageMultisample (GL_RENDERBUFFER, 4, GL_RGBA8, width, height); glFramebufferRenderbuffer (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, msaaColorHandle); }