Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
indent
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed May 23, 2009
1 parent b0ac961 commit 4b65d63
Show file tree
Hide file tree
Showing 41 changed files with 7,629 additions and 7,690 deletions.
6 changes: 4 additions & 2 deletions XCodeiPhoneOS/Demos/src/keyboard.c
View file
Expand Up @@ -174,7 +174,8 @@ void
drawBlank(int x, int y)
{
SDL_Rect rect = { x, y, GLYPH_SIZE_SCREEN, GLYPH_SIZE_SCREEN };
SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b, bg_color.unused);
SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b,
bg_color.unused);
SDL_RenderFill(&rect);
}

Expand Down Expand Up @@ -254,7 +255,8 @@ main(int argc, char *argv[])
loadFont();

/* draw the background, we'll just paint over it */
SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b, bg_color.unused);
SDL_SetRenderDrawColor(bg_color.r, bg_color.g, bg_color.b,
bg_color.unused);
SDL_RenderFill(NULL);
SDL_RenderPresent();

Expand Down
2 changes: 1 addition & 1 deletion XCodeiPhoneOS/Demos/src/mixer.c
View file
Expand Up @@ -168,7 +168,7 @@ render(void)
{
int i;
SDL_SetRenderDrawColor(50, 50, 50, 255);
SDL_RenderFill(NULL); /* draw background (gray) */
SDL_RenderFill(NULL); /* draw background (gray) */
/* draw the drum buttons */
for (i = 0; i < NUM_DRUMS; i++) {
SDL_Color color =
Expand Down
64 changes: 38 additions & 26 deletions include/SDL_opengles.h
View file
Expand Up @@ -50,7 +50,7 @@ extern "C"

#ifndef GL_API
#define GL_API
#endif /* GL_API */
#endif /* GL_API */

/*
** License Applicability. Except to the extent portions of this file are
Expand Down Expand Up @@ -347,10 +347,10 @@ extern "C"
/* OpenGL ES 1.0 defines, they gone in 1.1 and 2.0 */
#ifndef GL_MAX_ELEMENTS_VERTICES
#define GL_MAX_ELEMENTS_VERTICES 0x80E8
#endif /* GL_MAX_ELEMENTS_VERTICES */
#endif /* GL_MAX_ELEMENTS_VERTICES */
#ifndef GL_MAX_ELEMENTS_INDICES
#define GL_MAX_ELEMENTS_INDICES 0x80E9
#endif /* GL_MAX_ELEMENTS_INDICES */
#endif /* GL_MAX_ELEMENTS_INDICES */

/* GetTextureParameter */
/* GL_TEXTURE_MAG_FILTER */
Expand Down Expand Up @@ -669,7 +669,7 @@ extern "C"
/* GL_OES_draw_texture */
#ifndef GL_OES_draw_texture
#define GL_TEXTURE_CROP_RECT_OES 0x8B9D
#endif /* GL_OES_draw_texture */
#endif /* GL_OES_draw_texture */

/* GL_OES_vertex_buffer_object */
#ifndef GL_OES_vertex_buffer_object
Expand All @@ -687,7 +687,7 @@ extern "C"
#define GL_BUFFER_SIZE_OES 0x8764
#define GL_BUFFER_USAGE_OES 0x8765
#define GL_BUFFER_ACCESS_OES 0x88BB
#endif /* GL_OES_vertex_buffer_object */
#endif /* GL_OES_vertex_buffer_object */

/*************************************************************/

Expand Down Expand Up @@ -973,8 +973,9 @@ extern "C"
/* GL_OES_query_matrix */
#ifndef GL_OES_query_matrix
#define GL_OES_query_matrix 1
GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
#endif /* GL_OES_query_matrix */
GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed mantissa[16],
GLint exponent[16]);
#endif /* GL_OES_query_matrix */

/* GL_OES_point_sprite */
#ifndef GL_OES_point_sprite
Expand All @@ -984,26 +985,35 @@ extern "C"
/* GL_OES_draw_texture */
#ifndef GL_OES_draw_texture
#define GL_OES_draw_texture 1
GL_API void GL_APIENTRY glDrawTexsOES (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
GL_API void GL_APIENTRY glDrawTexiOES (GLint x, GLint y, GLint z, GLint width, GLint height);
GL_API void GL_APIENTRY glDrawTexxOES (GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
GL_API void GL_APIENTRY glDrawTexsvOES (const GLshort *coords);
GL_API void GL_APIENTRY glDrawTexivOES (const GLint *coords);
GL_API void GL_APIENTRY glDrawTexxvOES (const GLfixed *coords);
GL_API void GL_APIENTRY glDrawTexfOES (GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
GL_API void GL_APIENTRY glDrawTexfvOES (const GLfloat *coords);
#endif /* GL_OES_draw_texture */
GL_API void GL_APIENTRY glDrawTexsOES(GLshort x, GLshort y, GLshort z,
GLshort width, GLshort height);
GL_API void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z,
GLint width, GLint height);
GL_API void GL_APIENTRY glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z,
GLfixed width, GLfixed height);
GL_API void GL_APIENTRY glDrawTexsvOES(const GLshort * coords);
GL_API void GL_APIENTRY glDrawTexivOES(const GLint * coords);
GL_API void GL_APIENTRY glDrawTexxvOES(const GLfixed * coords);
GL_API void GL_APIENTRY glDrawTexfOES(GLfloat x, GLfloat y, GLfloat z,
GLfloat width, GLfloat height);
GL_API void GL_APIENTRY glDrawTexfvOES(const GLfloat * coords);
#endif /* GL_OES_draw_texture */

/* GL_OES_single_precision */
#ifndef GL_OES_single_precision
#define GL_OES_single_precision 1
GL_API void GL_APIENTRY glDepthRangefOES (GLclampf zNear, GLclampf zFar);
GL_API void GL_APIENTRY glFrustumfOES (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
GL_API void GL_APIENTRY glOrthofOES (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
GL_API void GL_APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation);
GL_API void GL_APIENTRY glGetClipPlanefOES (GLenum pname, GLfloat eqn[4]);
GL_API void GL_APIENTRY glClearDepthfOES (GLclampf depth);
#endif /* GL_OES_single_precision */
GL_API void GL_APIENTRY glDepthRangefOES(GLclampf zNear, GLclampf zFar);
GL_API void GL_APIENTRY glFrustumfOES(GLfloat left, GLfloat right,
GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar);
GL_API void GL_APIENTRY glOrthofOES(GLfloat left, GLfloat right,
GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar);
GL_API void GL_APIENTRY glClipPlanefOES(GLenum plane,
const GLfloat * equation);
GL_API void GL_APIENTRY glGetClipPlanefOES(GLenum pname, GLfloat eqn[4]);
GL_API void GL_APIENTRY glClearDepthfOES(GLclampf depth);
#endif /* GL_OES_single_precision */

/* GL_OES_vertex_buffer_object */
#ifndef GL_OES_vertex_buffer_object
Expand All @@ -1012,10 +1022,12 @@ extern "C"
GL_API void APIENTRY glDeleteBuffersOES(GLsizei, const GLuint *);
GL_API void APIENTRY glGenBuffersOES(GLsizei, GLuint *);
GL_API GLboolean APIENTRY glIsBufferOES(GLuint);
GL_API void APIENTRY glBufferDataOES(GLenum, GLsizeiptr, const GLvoid *, GLenum);
GL_API void APIENTRY glBufferSubDataOES(GLenum, GLintptr, GLsizeiptr, const GLvoid *);
GL_API void APIENTRY glBufferDataOES(GLenum, GLsizeiptr, const GLvoid *,
GLenum);
GL_API void APIENTRY glBufferSubDataOES(GLenum, GLintptr, GLsizeiptr,
const GLvoid *);
GL_API void APIENTRY glGetBufferParameterivOES(GLenum, GLenum, GLint *);
#endif /* GL_OES_vertex_buffer_object */
#endif /* GL_OES_vertex_buffer_object */

#ifdef __cplusplus
}
Expand Down
4 changes: 2 additions & 2 deletions include/SDL_video.h
View file
Expand Up @@ -271,8 +271,8 @@ typedef enum
SDL_GL_MULTISAMPLESAMPLES,
SDL_GL_ACCELERATED_VISUAL,
SDL_GL_RETAINED_BACKING,
SDL_GL_CONTEXT_MAJOR_VERSION,
SDL_GL_CONTEXT_MINOR_VERSION
SDL_GL_CONTEXT_MAJOR_VERSION,
SDL_GL_CONTEXT_MINOR_VERSION
} SDL_GLattr;


Expand Down
2 changes: 1 addition & 1 deletion src/SDL_compat.c
View file
Expand Up @@ -494,7 +494,7 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
return NULL;
}
}

SDL_GetDesktopDisplayMode(&desktop_mode);

if (width == 0) {
Expand Down
5 changes: 3 additions & 2 deletions src/audio/SDL_audio.c
View file
Expand Up @@ -477,7 +477,8 @@ SDL_RunAudio(void *devicep)
/* Wait for an audio buffer to become available */
current_audio.impl.WaitDevice(device);
} else {
SDL_Delay((device->spec.samples * 1000) / device->spec.freq);
SDL_Delay((device->spec.samples * 1000) /
device->spec.freq);
}
}

Expand Down Expand Up @@ -525,7 +526,7 @@ SDL_RunAudio(void *devicep)
/* Wait for an audio buffer to become available */
current_audio.impl.WaitDevice(device);
} else {
SDL_Delay((device->spec.samples * 1000) / device->spec.freq);
SDL_Delay((device->spec.samples * 1000) / device->spec.freq);
}
}
}
Expand Down

0 comments on commit 4b65d63

Please sign in to comment.