Mercurial > sdl-ios-xcode

changeset 5206:25ffd4e5255c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor consistency cleanup and documentation link update.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 06 Feb 2011 00:48:41 -0800
parents 1f2b17f42fd0
children daa5463466c5
files src/render/direct3d/SDL_render_d3d.c src/render/opengl/SDL_render_gl.c src/render/opengles/SDL_render_gles.c
diffstat 3 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/render/direct3d/SDL_render_d3d.c	Sun Feb 06 00:48:16 2011 -0800
+++ b/src/render/direct3d/SDL_render_d3d.c	Sun Feb 06 00:48:41 2011 -0800
@@ -116,7 +116,7 @@
     D3D_CreateRenderer,
     {
      "direct3d",
-     (SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED),
+     (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC),
      1,
      {SDL_PIXELFORMAT_ARGB8888},
      0,
--- a/src/render/opengl/SDL_render_gl.c	Sun Feb 06 00:48:16 2011 -0800
+++ b/src/render/opengl/SDL_render_gl.c	Sun Feb 06 00:48:41 2011 -0800
@@ -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 @@
     GL_CreateRenderer,
     {
      "opengl",
-     (SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED),
+     (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC),
      1,
      {SDL_PIXELFORMAT_ARGB8888},
      0,
@@ -331,7 +331,6 @@
                GLint* internalFormat, GLenum* format, GLenum* type)
 {
     switch (pixel_format) {
-    case SDL_PIXELFORMAT_RGB888:
     case SDL_PIXELFORMAT_ARGB8888:
         *internalFormat = GL_RGBA8;
         *format = GL_BGRA;
--- a/src/render/opengles/SDL_render_gles.c	Sun Feb 06 00:48:16 2011 -0800
+++ b/src/render/opengles/SDL_render_gles.c	Sun Feb 06 00:48:41 2011 -0800
@@ -74,8 +74,8 @@
 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 @@
         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;
     }