pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed building on Android, added SDL_opengles2.h, removed unnecessary SDL_glesfuncs.h

Browse source 
--HG--
rename : src/video/SDL_glfuncs.h => src/render/opengl/SDL_glfuncs.h
This commit is contained in:
Sam Lantinga 2011-02-06 02:35:14 -08:00
parent cc1f36b7dc
commit 58e9ea986f
13 changed files with 152 additions and 1387 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/render/opengl/SDL_render_gl.c
View file

@ -88,7 +88,7 @@ typedef struct
/* OpenGL functions */
#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
#include "../../video/SDL_glfuncs.h"
#include "SDL_glfuncs.h"
#undef SDL_PROC
void (*glTextureRangeAPPLE) (GLenum target, GLsizei length,
@ -161,7 +161,7 @@ GL_LoadFunctions(GL_RenderData * data)
} while ( 0 );
#endif /* __SDL_NOGETPROCADDR__ */
#include "../../video/SDL_glfuncs.h"
#include "SDL_glfuncs.h"
#undef SDL_PROC
return 0;
}
@ -213,11 +213,6 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->info.flags = SDL_RENDERER_ACCELERATED;
if (GL_LoadFunctions(data) < 0) {
GL_DestroyRenderer(renderer);
return NULL;
}
data->context = SDL_GL_CreateContext(window);
if (!data->context) {
GL_DestroyRenderer(renderer);
@ -227,6 +222,12 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
GL_DestroyRenderer(renderer);
return NULL;
}
if (GL_LoadFunctions(data) < 0) {
GL_DestroyRenderer(renderer);
return NULL;
}
#ifdef __MACOSX__
/* Enable multi-threaded rendering */
/* Disabled until Ryan finishes his VBO/PBO code...