Mercurial > sdl-ios-xcode

diff src/video/qnxgf/SDL_qnxgf.h @ 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 7b3a09fb9c8b
line wrap: on
line diff
--- a/src/video/qnxgf/SDL_qnxgf.h	Mon Mar 23 05:37:45 2009 +0000
+++ b/src/video/qnxgf/SDL_qnxgf.h	Tue Mar 24 10:33:12 2009 +0000
@@ -30,12 +30,22 @@
 #include "../SDL_sysvideo.h"
 
 #include <gf/gf.h>
+#include <gf/gf3d.h>
+
+#if defined(SDL_VIDEO_OPENGL_ES)
+   #include <GLES/egl.h>
+#endif /* SDL_VIDEO_OPENGL_ES */
 
 typedef struct SDL_VideoData
 {
    gf_dev_t      gfdev;              /* GF device handle                     */
    gf_dev_info_t gfdev_info;         /* GF device information                */
    SDL_bool      gfinitialized;      /* GF device initialization status      */
+   #if defined(SDL_VIDEO_OPENGL_ES)
+      EGLDisplay egldisplay;         /* OpenGL ES display connection         */
+      uint32_t   egl_refcount;       /* OpenGL ES reference count            */
+      uint32_t   swapinterval;       /* OpenGL ES default swap interval      */
+   #endif /* SDL_VIDEO_OPENGL_ES */
 } SDL_VideoData;
 
 #define SDL_VIDEO_GF_DEVICENAME_MAX 257
@@ -55,9 +65,23 @@
 
 typedef struct SDL_WindowData
 {
-   SDL_bool     uses_gles;           /* if true window must support OpenGL ES*/
+   SDL_bool   uses_gles;               /* true if window support OpenGL ES   */
+   #if defined(SDL_VIDEO_OPENGL_ES)
+      gf_3d_target_t target;           /* OpenGL ES window target            */
+      SDL_bool   target_created;       /* GF 3D target is created if true    */
+      EGLConfig  gles_config;          /* OpenGL ES framebuffer configuration*/
+      EGLContext gles_context;         /* OpenGL ES context                  */
+      EGLint     gles_attributes[256]; /* OpenGL ES attributes for context   */
+      EGLSurface gles_surface;         /* OpenGL ES target rendering surface */
+   #endif /* SDL_VIDEO_OPENGL_ES */
 } SDL_WindowData;
 
+typedef struct SDL_GLDriverData
+{
+   #if defined(SDL_VIDEO_OPENGL_ES)
+   #endif /* SDL_VIDEO_OPENGL_ES */
+} SDL_GLDriverData;
+
 /****************************************************************************/
 /* Low level GF graphics driver capabilities                                */
 /****************************************************************************/
@@ -69,6 +93,10 @@
 
 #define SDL_GF_UNACCELERATED         0x00000000
 #define SDL_GF_ACCELERATED           0x00000001
+#define SDL_GF_NOLOWRESOLUTION       0x00000000
+#define SDL_GF_LOWRESOLUTION         0x00000002
+#define SDL_GF_UNACCELERATED_3D      0x00000000
+#define SDL_GF_ACCELERATED_3D        0x00000004
 
 /****************************************************************************/
 /* SDL_VideoDevice functions declaration                                    */