Mercurial > sdl-ios-xcode

diff src/video/SDL_video.c @ 3099:82e60908fab1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Mon, 23 Mar 2009 09:17:24 +0200 From: "Mike Gorchak" Subject: New QNX patches Please apply patch qnx4.diff, which is attached. What has been done: 1)Added back OpenGL ES renderer for QNX target. Added few corrections to OpenGL ES renderer to let it work under QNX. OpenGL ES renderer do not support textures under QNX, so I think some additional work must be done. 2) Added GL_OES_query_matrix extension to SDL_opengles.h header file, which required by OpenGL ES 1.1 specification. 3) Added attribute clearing at the entrance of function SDL_GL_GetAttribure(). Added error checking into the function SDL_GL_GetAttribure(), because some attributes can't be obtained in OpenGL ES 1.0. 4) Porting testdyngles to OpenGL ES 1.0 (1.1 has glColor4ub() and glColor4f() functions, but 1.0 has glColor4f() only). 5) Added error checking after obtaining attributes using SDL_GL_GetAttribute() function to the testgl2 and testgles. 6) Small correction to testmultiaudio with printing errors. 7) Added software and accelerated OpenGL ES 1.0 support into the QNX GF driver. Please remove ./src/audio/nto directory - it will not be used anymore. Please create ./src/audio/qsa directory and add content of the archive qsa.tar.gz into this directory. I rewrote some sound code, added support for multiple audio cards, enumeration, etc. Added initial support for capture. As far as I can understand SDL 1.3 is not supporting audio capture right now ? Sam, Am I right ? Or audio capture must be supported through the PlayDevice routine ? And last, please put file SDL_gf_opengles.c to the ./src/video/qnxgf directory. It is OpenGL ES 1.1 emulation layer for some functions, which are not supported by OpenGL ES 1.0.
author Sam Lantinga <slouken@libsdl.org>
date Tue, 24 Mar 2009 10:33:12 +0000
parents cad1aefa2ed9
children 7dc982143c06
line wrap: on
line diff
--- a/src/video/SDL_video.c	Mon Mar 23 05:37:45 2009 +0000
+++ b/src/video/SDL_video.c	Tue Mar 24 10:33:12 2009 +0000
@@ -2711,12 +2711,23 @@
 {
 #if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES
     void (APIENTRY * glGetIntegervFunc) (GLenum pname, GLint * params);
+    GLenum (APIENTRY * glGetErrorFunc) (void);
     GLenum attrib = 0;
+    GLenum error = 0;
 
     glGetIntegervFunc = SDL_GL_GetProcAddress("glGetIntegerv");
     if (!glGetIntegervFunc) {
         return -1;
     }
+
+    glGetErrorFunc = SDL_GL_GetProcAddress("glGetError");
+    if (!glGetErrorFunc) {
+        return -1;
+    }
+
+    /* Clear value in any case */
+    *value=0;
+
     switch (attr) {
     case SDL_GL_RETAINED_BACKING:
         *value = _this->gl_config.retained_backing;
@@ -2738,11 +2749,10 @@
         attrib = GL_DOUBLEBUFFER;
         break;
 #else
-        /*
-         * I believe double buffering is the only option in OpenGL ES
-         * -- in any case, GL_DOUBLEBUFFER doesn't exist
-         */
-        *value = 1;
+        /* OpenGL ES 1.0 and above specifications have EGL_SINGLE_BUFFER      */
+        /* parameter which switches double buffer to single buffer. OpenGL ES */
+        /* SDL driver must set proper value after initialization              */
+        *value = _this->gl_config.double_buffer;
         return 0;
 #endif
     case SDL_GL_DEPTH_SIZE:
@@ -2824,6 +2834,29 @@
     }
 
     glGetIntegervFunc(attrib, (GLint *) value);
+    error=glGetErrorFunc();
+    if (error!=GL_NO_ERROR)
+    {
+       switch (error)
+       {
+          case GL_INVALID_ENUM:
+               {
+                  SDL_SetError("OpenGL error: GL_INVALID_ENUM");
+               }
+               break;
+          case GL_INVALID_VALUE:
+               {
+                  SDL_SetError("OpenGL error: GL_INVALID_VALUE");
+               }
+               break;
+          default:
+               {
+                  SDL_SetError("OpenGL error: %08X", error);
+               }
+               break;
+       }
+       return -1;
+    }
     return 0;
 #else
     SDL_Unsupported();