From 624d63081b9df741247d923234040bc1dab8e2a4 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 6 Feb 2011 00:48:41 -0800 Subject: [PATCH] Minor consistency cleanup and documentation link update. --- src/render/direct3d/SDL_render_d3d.c | 2 +- src/render/opengl/SDL_render_gl.c | 5 ++--- src/render/opengles/SDL_render_gles.c | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c index 1061f732c..482a1e030 100644 --- a/src/render/direct3d/SDL_render_d3d.c +++ b/src/render/direct3d/SDL_render_d3d.c @@ -116,7 +116,7 @@ SDL_RenderDriver D3D_RenderDriver = { D3D_CreateRenderer, { "direct3d", - (SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), + (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC), 1, {SDL_PIXELFORMAT_ARGB8888}, 0, diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c index d21a8bb14..fcb96d669 100644 --- a/src/render/opengl/SDL_render_gl.c +++ b/src/render/opengl/SDL_render_gl.c @@ -34,7 +34,7 @@ /* OpenGL renderer implementation */ /* 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 */ @@ -72,7 +72,7 @@ SDL_RenderDriver GL_RenderDriver = { GL_CreateRenderer, { "opengl", - (SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), + (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC), 1, {SDL_PIXELFORMAT_ARGB8888}, 0, @@ -331,7 +331,6 @@ convert_format(GL_RenderData *renderdata, Uint32 pixel_format, GLint* internalFormat, GLenum* format, GLenum* type) { switch (pixel_format) { - case SDL_PIXELFORMAT_RGB888: case SDL_PIXELFORMAT_ARGB8888: *internalFormat = GL_RGBA8; *format = GL_BGRA; diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c index c21b9368b..34134a73e 100644 --- a/src/render/opengles/SDL_render_gles.c +++ b/src/render/opengles/SDL_render_gles.c @@ -74,8 +74,8 @@ static void GLES_DestroyRenderer(SDL_Renderer * renderer); SDL_RenderDriver GLES_RenderDriver = { GLES_CreateRenderer, { - "opengl_es", - (SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED), + "opengles", + (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC), 1, {SDL_PIXELFORMAT_ABGR8888}, 0, @@ -331,8 +331,7 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) type = GL_UNSIGNED_BYTE; break; default: - SDL_SetError("Texture format %s not supported by OpenGL ES", - SDL_GetPixelFormatName(texture->format)); + SDL_SetError("Texture format not supported"); return -1; }