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

Minor consistency cleanup and documentation link update.

Browse source
This commit is contained in:
Sam Lantinga 2011-02-06 00:48:41 -08:00
parent 0e1d3a505d
commit cc1f36b7dc
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/render/direct3d/SDL_render_d3d.c
View file

@ -116,7 +116,7 @@ SDL_RenderDriver D3D_RenderDriver = {
D3D_CreateRenderer, D3D_CreateRenderer,
{ {
"direct3d", "direct3d",
(SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC),
1, 1,
{SDL_PIXELFORMAT_ARGB8888}, {SDL_PIXELFORMAT_ARGB8888},
0, 0,

5
src/render/opengl/SDL_render_gl.c
View file

@ -34,7 +34,7 @@
/* OpenGL renderer implementation */ /* OpenGL renderer implementation */
/* Details on optimizing the texture path on Mac OS X: /* Details on optimizing the texture path on Mac OS X:
http://developer.apple.com/documentation/GraphicsImaging/Conceptual/OpenGL-MacProgGuide/opengl_texturedata/chapter_10_section_2.html http://developer.apple.com/library/mac/#documentation/GraphicsImaging/Conceptual/OpenGL-MacProgGuide/opengl_texturedata/opengl_texturedata.html
*/ */
/* Used to re-create the window with OpenGL capability */ /* Used to re-create the window with OpenGL capability */
@ -72,7 +72,7 @@ SDL_RenderDriver GL_RenderDriver = {
GL_CreateRenderer, GL_CreateRenderer,
{ {
"opengl", "opengl",
(SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC),
1, 1,
{SDL_PIXELFORMAT_ARGB8888}, {SDL_PIXELFORMAT_ARGB8888},
0, 0,
@ -331,7 +331,6 @@ convert_format(GL_RenderData *renderdata, Uint32 pixel_format,
GLint* internalFormat, GLenum* format, GLenum* type) GLint* internalFormat, GLenum* format, GLenum* type)
{ {
switch (pixel_format) { switch (pixel_format) {
case SDL_PIXELFORMAT_RGB888:
case SDL_PIXELFORMAT_ARGB8888: case SDL_PIXELFORMAT_ARGB8888:
*internalFormat = GL_RGBA8; *internalFormat = GL_RGBA8;
*format = GL_BGRA; *format = GL_BGRA;

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

@ -74,8 +74,8 @@ static void GLES_DestroyRenderer(SDL_Renderer * renderer);
SDL_RenderDriver GLES_RenderDriver = { SDL_RenderDriver GLES_RenderDriver = {
GLES_CreateRenderer, GLES_CreateRenderer,
{ {
"opengl_es", "opengles",
(SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC),
1, 1,
{SDL_PIXELFORMAT_ABGR8888}, {SDL_PIXELFORMAT_ABGR8888},
0, 0,
@ -331,8 +331,7 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
break; break;
default: default:
SDL_SetError("Texture format %s not supported by OpenGL ES", SDL_SetError("Texture format not supported");
SDL_GetPixelFormatName(texture->format));
return -1; return -1;
} }