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

indent

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403426
This commit is contained in:
Sam Lantinga 2009-01-02 16:03:37 +00:00
parent b84ae14eeb
commit 00a0a23f4a
2 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/video/SDL_glesfuncs.h
View file

@ -87,8 +87,7 @@ SDL_PROC_UNUSED(void, glColorMask,
(GLboolean red, GLboolean green, GLboolean blue, (GLboolean red, GLboolean green, GLboolean blue,
GLboolean alpha)) GLboolean alpha))
SDL_PROC(void, glColorPointer, SDL_PROC(void, glColorPointer,
(GLint size, GLenum type, GLsizei stride, (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer))
const GLvoid * pointer))
SDL_PROC_UNUSED(void, glCompressedTexImage2D, SDL_PROC_UNUSED(void, glCompressedTexImage2D,
(GLenum target, GLint level, GLenum internalformat, (GLenum target, GLint level, GLenum internalformat,
GLsizei width, GLsizei height, GLint border, GLsizei width, GLsizei height, GLint border,

66
src/video/SDL_renderer_gles.c
View file

@ -632,14 +632,14 @@ GLES_RenderPoint(SDL_Renderer * renderer, int x, int y)
(GLfloat) renderer->b * inv255f, (GLfloat) renderer->b * inv255f,
(GLfloat) renderer->a * inv255f); (GLfloat) renderer->a * inv255f);
GLshort vertices[2]; GLshort vertices[2];
vertices[0] = x; vertices[0] = x;
vertices[1] = y; vertices[1] = y;
data->glVertexPointer(2, GL_SHORT, 0, vertices); data->glVertexPointer(2, GL_SHORT, 0, vertices);
data->glEnableClientState(GL_VERTEX_ARRAY); data->glEnableClientState(GL_VERTEX_ARRAY);
data->glDrawArrays(GL_POINTS, 0, 1); data->glDrawArrays(GL_POINTS, 0, 1);
data->glDisableClientState(GL_VERTEX_ARRAY); data->glDisableClientState(GL_VERTEX_ARRAY);
return 0; return 0;
} }
@ -656,16 +656,16 @@ GLES_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2)
(GLfloat) renderer->b * inv255f, (GLfloat) renderer->b * inv255f,
(GLfloat) renderer->a * inv255f); (GLfloat) renderer->a * inv255f);
GLshort vertices[4]; GLshort vertices[4];
vertices[0] = x1; vertices[0] = x1;
vertices[1] = y1; vertices[1] = y1;
vertices[2] = x2; vertices[2] = x2;
vertices[3] = y2; vertices[3] = y2;
data->glVertexPointer(2, GL_SHORT, 0, vertices); data->glVertexPointer(2, GL_SHORT, 0, vertices);
data->glEnableClientState(GL_VERTEX_ARRAY); data->glEnableClientState(GL_VERTEX_ARRAY);
data->glDrawArrays(GL_LINES, 0, 2); data->glDrawArrays(GL_LINES, 0, 2);
data->glDisableClientState(GL_VERTEX_ARRAY); data->glDisableClientState(GL_VERTEX_ARRAY);
return 0; return 0;
} }
@ -682,25 +682,25 @@ GLES_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect)
(GLfloat) renderer->b * inv255f, (GLfloat) renderer->b * inv255f,
(GLfloat) renderer->a * inv255f); (GLfloat) renderer->a * inv255f);
GLshort minx = rect->x; GLshort minx = rect->x;
GLshort maxx = rect->x + rect->w; GLshort maxx = rect->x + rect->w;
GLshort miny = rect->y; GLshort miny = rect->y;
GLshort maxy = rect->y + rect->h; GLshort maxy = rect->y + rect->h;
GLshort vertices[8]; GLshort vertices[8];
vertices[0] = minx; vertices[0] = minx;
vertices[1] = miny; vertices[1] = miny;
vertices[2] = maxx; vertices[2] = maxx;
vertices[3] = miny; vertices[3] = miny;
vertices[4] = minx; vertices[4] = minx;
vertices[5] = maxy; vertices[5] = maxy;
vertices[6] = maxx; vertices[6] = maxx;
vertices[7] = maxy; vertices[7] = maxy;
data->glVertexPointer(2, GL_SHORT, 0, vertices); data->glVertexPointer(2, GL_SHORT, 0, vertices);
data->glEnableClientState(GL_VERTEX_ARRAY); data->glEnableClientState(GL_VERTEX_ARRAY);
data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
data->glDisableClientState(GL_VERTEX_ARRAY); data->glDisableClientState(GL_VERTEX_ARRAY);
return 0; return 0;
} }