Mercurial > sdl-ios-xcode
changeset 2964:0faae272a372
indent
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 02 Jan 2009 16:03:37 +0000 |
parents | ee331407574f |
children | 5066298aa82a |
files | src/video/SDL_glesfuncs.h src/video/SDL_renderer_gles.c |
diffstat | 2 files changed, 38 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/SDL_glesfuncs.h Fri Jan 02 15:47:49 2009 +0000 +++ b/src/video/SDL_glesfuncs.h Fri Jan 02 16:03:37 2009 +0000 @@ -87,8 +87,7 @@ (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)) SDL_PROC(void, glColorPointer, - (GLint size, GLenum type, GLsizei stride, - const GLvoid * pointer)) + (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer)) SDL_PROC_UNUSED(void, glCompressedTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border,
--- a/src/video/SDL_renderer_gles.c Fri Jan 02 15:47:49 2009 +0000 +++ b/src/video/SDL_renderer_gles.c Fri Jan 02 16:03:37 2009 +0000 @@ -632,15 +632,15 @@ (GLfloat) renderer->b * inv255f, (GLfloat) renderer->a * inv255f); - GLshort vertices[2]; - vertices[0] = x; - vertices[1] = y; - - data->glVertexPointer(2, GL_SHORT, 0, vertices); - data->glEnableClientState(GL_VERTEX_ARRAY); - data->glDrawArrays(GL_POINTS, 0, 1); - data->glDisableClientState(GL_VERTEX_ARRAY); - + GLshort vertices[2]; + vertices[0] = x; + vertices[1] = y; + + data->glVertexPointer(2, GL_SHORT, 0, vertices); + data->glEnableClientState(GL_VERTEX_ARRAY); + data->glDrawArrays(GL_POINTS, 0, 1); + data->glDisableClientState(GL_VERTEX_ARRAY); + return 0; } @@ -656,16 +656,16 @@ (GLfloat) renderer->b * inv255f, (GLfloat) renderer->a * inv255f); - GLshort vertices[4]; - vertices[0] = x1; - vertices[1] = y1; - vertices[2] = x2; - vertices[3] = y2; + GLshort vertices[4]; + vertices[0] = x1; + vertices[1] = y1; + vertices[2] = x2; + vertices[3] = y2; - data->glVertexPointer(2, GL_SHORT, 0, vertices); - data->glEnableClientState(GL_VERTEX_ARRAY); - data->glDrawArrays(GL_LINES, 0, 2); - data->glDisableClientState(GL_VERTEX_ARRAY); + data->glVertexPointer(2, GL_SHORT, 0, vertices); + data->glEnableClientState(GL_VERTEX_ARRAY); + data->glDrawArrays(GL_LINES, 0, 2); + data->glDisableClientState(GL_VERTEX_ARRAY); return 0; } @@ -682,25 +682,25 @@ (GLfloat) renderer->b * inv255f, (GLfloat) renderer->a * inv255f); - GLshort minx = rect->x; - GLshort maxx = rect->x + rect->w; - GLshort miny = rect->y; - GLshort maxy = rect->y + rect->h; - - GLshort vertices[8]; - vertices[0] = minx; - vertices[1] = miny; - vertices[2] = maxx; - vertices[3] = miny; - vertices[4] = minx; - vertices[5] = maxy; - vertices[6] = maxx; - vertices[7] = maxy; - - data->glVertexPointer(2, GL_SHORT, 0, vertices); - data->glEnableClientState(GL_VERTEX_ARRAY); - data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - data->glDisableClientState(GL_VERTEX_ARRAY); + GLshort minx = rect->x; + GLshort maxx = rect->x + rect->w; + GLshort miny = rect->y; + GLshort maxy = rect->y + rect->h; + + GLshort vertices[8]; + vertices[0] = minx; + vertices[1] = miny; + vertices[2] = maxx; + vertices[3] = miny; + vertices[4] = minx; + vertices[5] = maxy; + vertices[6] = maxx; + vertices[7] = maxy; + + data->glVertexPointer(2, GL_SHORT, 0, vertices); + data->glEnableClientState(GL_VERTEX_ARRAY); + data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + data->glDisableClientState(GL_VERTEX_ARRAY); return 0; }