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

Fixed testgles on iOS (bug 1136)

Browse source
This commit is contained in:
Sam Lantinga 2011-02-20 14:16:11 -08:00
parent f0c1972949
commit 8e56849e83
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/video/uikit/SDL_uikitopengles.m
View file

@ -40,7 +40,7 @@ UIKit_GL_GetProcAddress(_THIS, const char *proc)
-Looking for the path to the OpenGL Library seems not to work in the iPhone Simulator. -Looking for the path to the OpenGL Library seems not to work in the iPhone Simulator.
-We don't know that the path won't change in the future. -We don't know that the path won't change in the future.
*/ */
return SDL_LoadFunction(RTLD_DEFAULT, proc); return dlsym(RTLD_DEFAULT, proc);
} }
/* /*

9
test/common.c
View file

@ -53,8 +53,6 @@ CommonCreateState(char **argv, Uint32 flags)
state->gl_multisamplesamples = 0; state->gl_multisamplesamples = 0;
state->gl_retained_backing = 1; state->gl_retained_backing = 1;
state->gl_accelerated = -1; state->gl_accelerated = -1;
state->gl_major_version = 2;
state->gl_minor_version = 1;
return state; return state;
} }
@ -590,8 +588,10 @@ CommonInit(CommonState * state)
state->gl_accelerated); state->gl_accelerated);
} }
SDL_GL_SetAttribute(SDL_GL_RETAINED_BACKING, state->gl_retained_backing); SDL_GL_SetAttribute(SDL_GL_RETAINED_BACKING, state->gl_retained_backing);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, state->gl_major_version); if (state->gl_major_version) {
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, state->gl_minor_version); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, state->gl_major_version);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, state->gl_minor_version);
}
if (state->verbose & VERBOSE_MODES) { if (state->verbose & VERBOSE_MODES) {
SDL_DisplayMode mode; SDL_DisplayMode mode;
@ -712,6 +712,7 @@ CommonInit(CommonState * state)
SDL_GetError()); SDL_GetError());
return SDL_FALSE; return SDL_FALSE;
} }
SDL_GetWindowSize(state->windows[i], &state->window_w, &state->window_h);
if (SDL_SetWindowDisplayMode(state->windows[i], &fullscreen_mode) < 0) { if (SDL_SetWindowDisplayMode(state->windows[i], &fullscreen_mode) < 0) {
fprintf(stderr, "Can't set up fullscreen display mode: %s\n", fprintf(stderr, "Can't set up fullscreen display mode: %s\n",

11
test/testgles.c
View file

@ -177,7 +177,7 @@ main(int argc, char *argv[])
SDL_GL_SetSwapInterval(0); SDL_GL_SetSwapInterval(0);
} }
SDL_GetCurrentDisplayMode(&mode); SDL_GetCurrentDisplayMode(0, &mode);
printf("Screen bpp: %d\n", SDL_BITSPERPIXEL(mode.format)); printf("Screen bpp: %d\n", SDL_BITSPERPIXEL(mode.format));
printf("\n"); printf("\n");
printf("Vendor : %s\n", glGetString(GL_VENDOR)); printf("Vendor : %s\n", glGetString(GL_VENDOR));
@ -243,6 +243,8 @@ main(int argc, char *argv[])
/* Set rendering settings for each context */ /* Set rendering settings for each context */
for (i = 0; i < state->num_windows; ++i) { for (i = 0; i < state->num_windows; ++i) {
float aspectAdjust;
status = SDL_GL_MakeCurrent(state->windows[i], context[i]); status = SDL_GL_MakeCurrent(state->windows[i], context[i]);
if (status) { if (status) {
printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError()); printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
@ -251,10 +253,11 @@ main(int argc, char *argv[])
continue; continue;
} }
aspectAdjust = (4.0f / 3.0f) / ((float)state->window_w / state->window_h);
glViewport(0, 0, state->window_w, state->window_h); glViewport(0, 0, state->window_w, state->window_h);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
glOrthof(-2.0, 2.0, -2.0, 2.0, -20.0, 20.0); glOrthof(-2.0, 2.0, -2.0 * aspectAdjust, 2.0 * aspectAdjust, -20.0, 20.0);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
@ -275,7 +278,7 @@ main(int argc, char *argv[])
switch (event.window.event) { switch (event.window.event) {
case SDL_WINDOWEVENT_RESIZED: case SDL_WINDOWEVENT_RESIZED:
for (i = 0; i < state->num_windows; ++i) { for (i = 0; i < state->num_windows; ++i) {
if (event.window.windowID == state->windows[i]) { if (event.window.windowID == SDL_GetWindowID(state->windows[i])) {
status = SDL_GL_MakeCurrent(state->windows[i], context[i]); status = SDL_GL_MakeCurrent(state->windows[i], context[i]);
if (status) { if (status) {
printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError()); printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
@ -327,3 +330,5 @@ main(int argc, char *argv[])
} }
#endif /* HAVE_OPENGLES */ #endif /* HAVE_OPENGLES */
/* vi: set ts=4 sw=4 expandtab: */