lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[iOS] Adjusted the code and build files to use Automatic Reference Counting

Browse source
This commit is contained in:
Laurent Gomila 2013-08-24 22:03:34 +02:00 • committed by Jonathan De Wachter
parent d50f94ca97
commit e20ff86330
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/SFML/Window/iOS/EaglContext.mm
View file

@ -30,7 +30,9 @@
#include <SFML/Window/iOS/SFView.hpp>
#include <SFML/System/Err.hpp>
#include <OpenGLES/EAGL.h>
#include <OpenGLES/EAGLDrawable.h>
#include <OpenGLES/ES1/glext.h>
#include <QuartzCore/CAEAGLLayer.h>
namespace sf
@ -98,9 +100,6 @@ EaglContext::~EaglContext()
// Restore the previous context
[EAGLContext setCurrentContext:previousContext];
// Release the context
[m_context release];
}
}
@ -125,7 +124,7 @@ void EaglContext::recreateRenderBuffers(SFView* glView)
glGenRenderbuffersOES(1, &m_colorbuffer);
glBindRenderbufferOES(GL_RENDERBUFFER_OES, m_colorbuffer);
if (glView)
[m_context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:glView.layer];
[m_context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)glView.layer];
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, m_colorbuffer);
// Create a depth buffer if requested

2
src/SFML/Window/iOS/WindowImplUIKit.mm
View file

@ -98,7 +98,7 @@ void WindowImplUIKit::processEvents()
////////////////////////////////////////////////////////////
WindowHandle WindowImplUIKit::getSystemHandle() const
{
return m_window;
return (__bridge WindowHandle)m_window;
}