diff -r 3ce59cbecaa3 src/video/SDL_renderer_gles.c --- a/src/video/SDL_renderer_gles.c Wed Jul 14 21:25:15 2010 -0700 +++ b/src/video/SDL_renderer_gles.c Sat Jul 17 04:03:49 2010 +0200 @@ -324,6 +324,9 @@ data->glDisable(GL_CULL_FACE); data->updateSize = SDL_TRUE; + data->glEnableClientState(GL_VERTEX_ARRAY); + data->glEnableClientState(GL_TEXTURE_COORD_ARRAY); + return renderer; } @@ -665,9 +668,7 @@ vertices[2*i+1] = (GLshort)points[i].y; } data->glVertexPointer(2, GL_SHORT, 0, vertices); - data->glEnableClientState(GL_VERTEX_ARRAY); data->glDrawArrays(GL_POINTS, 0, count); - data->glDisableClientState(GL_VERTEX_ARRAY); SDL_stack_free(vertices); return 0; @@ -694,7 +695,6 @@ vertices[2*i+1] = (GLshort)points[i].y; } data->glVertexPointer(2, GL_SHORT, 0, vertices); - data->glEnableClientState(GL_VERTEX_ARRAY); if (count > 2 && points[0].x == points[count-1].x && points[0].y == points[count-1].y) { /* GL_LINE_LOOP takes care of the final segment */ @@ -703,7 +703,6 @@ } else { data->glDrawArrays(GL_LINE_STRIP, 0, count); } - data->glDisableClientState(GL_VERTEX_ARRAY); SDL_stack_free(vertices); return 0; @@ -723,7 +722,6 @@ (GLfloat) renderer->b * inv255f, (GLfloat) renderer->a * inv255f); - data->glEnableClientState(GL_VERTEX_ARRAY); for (i = 0; i < count; ++i) { const SDL_Rect *rect = rects[i]; GLshort minx = rect->x; @@ -743,7 +741,6 @@ data->glVertexPointer(2, GL_SHORT, 0, vertices); data->glDrawArrays(GL_LINE_LOOP, 0, 4); } - data->glDisableClientState(GL_VERTEX_ARRAY); return 0; } @@ -762,7 +759,6 @@ (GLfloat) renderer->b * inv255f, (GLfloat) renderer->a * inv255f); - data->glEnableClientState(GL_VERTEX_ARRAY); for (i = 0; i < count; ++i) { const SDL_Rect *rect = rects[i]; GLshort minx = rect->x; @@ -782,7 +778,6 @@ data->glVertexPointer(2, GL_SHORT, 0, vertices); data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } - data->glDisableClientState(GL_VERTEX_ARRAY); return 0; } @@ -925,12 +920,8 @@ texCoords[7] = maxv; data->glVertexPointer(2, GL_SHORT, 0, vertices); - data->glEnableClientState(GL_VERTEX_ARRAY); data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords); - data->glEnableClientState(GL_TEXTURE_COORD_ARRAY); data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - data->glDisableClientState(GL_TEXTURE_COORD_ARRAY); - data->glDisableClientState(GL_VERTEX_ARRAY); } data->glDisable(GL_TEXTURE_2D);