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

Fixed crash when drawing non-textured primitives

Browse source
This commit is contained in:
Sam Lantinga 2011-02-17 02:16:30 -08:00
parent 765c7da302
commit b411d9fc24
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/render/opengles/SDL_render_gles.c
View file

@ -239,7 +239,7 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
glLoadIdentity(); glLoadIdentity();
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY); //glEnableClientState(GL_TEXTURE_COORD_ARRAY);
return renderer; return renderer;
} }
@ -247,8 +247,6 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
static void static void
GLES_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event) GLES_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
{ {
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) { if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
/* Rebind the context to the window area and update matrices */ /* Rebind the context to the window area and update matrices */
SDL_CurrentContext = NULL; SDL_CurrentContext = NULL;
@ -595,13 +593,11 @@ GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata; GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata;
int minx, miny, maxx, maxy; int minx, miny, maxx, maxy;
GLfloat minu, maxu, minv, maxv; GLfloat minu, maxu, minv, maxv;
int i;
void *temp_buffer; /* used for reformatting dirty rect pixels */
void *temp_ptr;
GLES_ActivateRenderer(renderer); GLES_ActivateRenderer(renderer);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glBindTexture(texturedata->type, texturedata->texture); glBindTexture(texturedata->type, texturedata->texture);
@ -673,6 +669,7 @@ GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
} }
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
return 0; return 0;