diff options
| -rwxr-xr-x | Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj | 10 | ||||
| -rw-r--r-- | src/render/opengles/SDL_glesfuncs.h | 1 | ||||
| -rwxr-xr-x | src/render/opengles/SDL_render_gles.c | 2 | ||||
| -rw-r--r-- | src/render/opengles2/SDL_gles2funcs.h | 1 | ||||
| -rwxr-xr-x | src/render/opengles2/SDL_render_gles2.c | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj index 57f4c9e844..68d408b864 100755 --- a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj +++ b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj @@ -1712,7 +1712,10 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = ( + armv7, + armv6, + ); "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ../../include; @@ -1727,7 +1730,10 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = ( + armv7, + armv6, + ); "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; HEADER_SEARCH_PATHS = ../../include; IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; diff --git a/src/render/opengles/SDL_glesfuncs.h b/src/render/opengles/SDL_glesfuncs.h index 4f2b2ce342..aab15a18aa 100644 --- a/src/render/opengles/SDL_glesfuncs.h +++ b/src/render/opengles/SDL_glesfuncs.h @@ -11,6 +11,7 @@ SDL_PROC(void, glDrawTexiOES, (GLint, GLint, GLint, GLint, GLint)) SDL_PROC(void, glEnable, (GLenum)) SDL_PROC(void, glEnableClientState, (GLenum)) SDL_PROC(void, glFinish, (void)) +SDL_PROC(void, glGenFramebuffersOES, (GLsizei, GLuint *)) SDL_PROC(void, glGenTextures, (GLsizei, GLuint *)) SDL_PROC(GLenum, glGetError, (void)) SDL_PROC(void, glGetIntegerv, (GLenum, GLint *)) diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c index 54344b4356..70a591b13b 100755 --- a/src/render/opengles/SDL_render_gles.c +++ b/src/render/opengles/SDL_render_gles.c @@ -206,7 +206,7 @@ GLES_GetFBO(GLES_RenderData *data, Uint32 w, Uint32 h) result = SDL_malloc(sizeof(GLES_FBOList)); result->w = w; result->h = h; - glGenFramebuffersOES(1, &result->FBO); + data->glGenFramebuffersOES(1, &result->FBO); result->next = data->framebuffers; data->framebuffers = result; } diff --git a/src/render/opengles2/SDL_gles2funcs.h b/src/render/opengles2/SDL_gles2funcs.h index e64528a465..7b7d5e17d8 100644 --- a/src/render/opengles2/SDL_gles2funcs.h +++ b/src/render/opengles2/SDL_gles2funcs.h @@ -17,6 +17,7 @@ SDL_PROC(void, glDrawArrays, (GLenum, GLint, GLsizei)) SDL_PROC(void, glEnable, (GLenum)) SDL_PROC(void, glEnableVertexAttribArray, (GLuint)) SDL_PROC(void, glFinish, (void)) +SDL_PROC(void, glGenFramebuffers, (GLsizei, GLuint *)) SDL_PROC(void, glGenTextures, (GLsizei, GLuint *)) SDL_PROC(void, glGetBooleanv, (GLenum, GLboolean *)) SDL_PROC(const GLubyte *, glGetString, (GLenum)) diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c index ffb686522a..61c6a7fb6b 100755 --- a/src/render/opengles2/SDL_render_gles2.c +++ b/src/render/opengles2/SDL_render_gles2.c @@ -210,7 +210,7 @@ GLES2_GetFBO(GLES2_DriverContext *data, Uint32 w, Uint32 h) result = SDL_malloc(sizeof(GLES2_FBOList)); result->w = w; result->h = h; - glGenFramebuffers(1, &result->FBO); + data->glGenFramebuffers(1, &result->FBO); result->next = data->framebuffers; data->framebuffers = result; } |