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

Whoops, can't call glOrtho() repeatedly

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403294
This commit is contained in:
Sam Lantinga 2008-12-05 07:00:58 +00:00
parent b1b8c20318
commit b19daa445d
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/video/SDL_renderer_gl.c
View file

@ -121,6 +121,7 @@ SDL_RenderDriver GL_RenderDriver = {
typedef struct typedef struct
{ {
SDL_GLContext context; SDL_GLContext context;
SDL_bool updateSize;
SDL_bool GL_ARB_texture_rectangle_supported; SDL_bool GL_ARB_texture_rectangle_supported;
SDL_bool GL_EXT_paletted_texture_supported; SDL_bool GL_EXT_paletted_texture_supported;
int blendMode; int blendMode;
@ -357,10 +358,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
} else { } else {
data->glEnable(GL_TEXTURE_2D); data->glEnable(GL_TEXTURE_2D);
} }
data->glMatrixMode(GL_PROJECTION); data->updateSize = SDL_TRUE;
data->glLoadIdentity();
data->glMatrixMode(GL_MODELVIEW);
data->glLoadIdentity();
return renderer; return renderer;
} }
@ -374,9 +372,10 @@ GL_ActivateRenderer(SDL_Renderer * renderer)
if (SDL_GL_MakeCurrent(window->id, data->context) < 0) { if (SDL_GL_MakeCurrent(window->id, data->context) < 0) {
return -1; return -1;
} }
data->glViewport(0, 0, window->w, window->h); if (data->updateSize) {
data->glOrtho(0.0, (GLdouble) window->w, (GLdouble) window->h, 0.0, 0.0, GL_DisplayModeChanged(renderer);
1.0); data->updateSize = SDL_FALSE;
}
return 0; return 0;
} }
@ -386,9 +385,14 @@ GL_DisplayModeChanged(SDL_Renderer * renderer)
GL_RenderData *data = (GL_RenderData *) renderer->driverdata; GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
SDL_Window *window = SDL_GetWindowFromID(renderer->window); SDL_Window *window = SDL_GetWindowFromID(renderer->window);
data->glMatrixMode(GL_PROJECTION);
data->glLoadIdentity();
data->glMatrixMode(GL_MODELVIEW);
data->glLoadIdentity();
data->glViewport(0, 0, window->w, window->h); data->glViewport(0, 0, window->w, window->h);
data->glOrtho(0.0, (GLdouble) window->w, (GLdouble) window->h, 0.0, 0.0, data->glOrtho(0.0, (GLdouble) window->w, (GLdouble) window->h, 0.0, 0.0,
1.0); 1.0);
return 0;
} }
static __inline__ int static __inline__ int