Mercurial > sdl-ios-xcode

diff src/video/photon/SDL_ph_video.h @ 701:aaf3b8af6616

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Sat, 30 Aug 2003 16:28:10 +0300 From: "Mike Gorchak" Subject: Re: SDL 1.2.6 - minor changes about shared library building under QNX6 into README.QNX - added forgotten libSDLmain.a into distribution, SDL.qpg.in - added header guards to the all headers. - fixed fullscreen double buffered mode. - fixed Photon crashes after/during using fullscreen OpenGL modes. - added GL_MakeCurrent function. - added SDL_VIDEOEXPOSE event, when OpenGL window have been resized - added more HAVE_OPENGL checks to avoid dead code compilation without using OpenGL - finished code reorganization (began into previous patches).
author Sam Lantinga <slouken@libsdl.org>
date Sat, 30 Aug 2003 17:07:59 +0000
parents 04dd6c6d7c30
children b14fdadd8311
line wrap: on
line diff
--- a/src/video/photon/SDL_ph_video.h	Sat Aug 30 09:09:09 2003 +0000
+++ b/src/video/photon/SDL_ph_video.h	Sat Aug 30 17:07:59 2003 +0000
@@ -46,9 +46,9 @@
 
 typedef struct
 {
-	unsigned char* Y;
-	unsigned char* V;
-	unsigned char* U;
+    unsigned char* Y;
+    unsigned char* V;
+    unsigned char* U;
 } FRAMEDATA;
 
 /* Mask values for SDL_ReallocFormat() */
@@ -68,6 +68,8 @@
     PhImage_t *image;	                 /* used to display image       */
 #ifdef HAVE_OPENGL
     PdOpenGLContext_t* OGLContext;       /* OpenGL context              */
+    Uint32 OGLFlags;                     /* OpenGL flags                */
+    Uint32 OGLBPP;                       /* OpenGL bpp                  */
 #endif /* HAVE_OPENGL */
     PgColor_t savedpal[_Pg_MAX_PALETTE];
     PgColor_t syspalph[_Pg_MAX_PALETTE];
@@ -82,8 +84,8 @@
         unsigned char*        CurrentFrameData;
         unsigned char*        FrameData0;
         unsigned char*        FrameData1;
-        int                   current;
-        long                  flags;
+        Uint32                current;
+        Uint32                flags;
     } ocimage;
 
     PgHWCaps_t graphics_card_caps;  /* Graphics card caps at the moment of start   */
@@ -94,9 +96,9 @@
     int mouse_relative;
     WMcursor* BlankCursor;
 
-    int depth;			/* current visual depth (not bpp)           */
-    int desktopbpp;             /* bpp of desktop at the moment of start    */
-    int desktoppal;             /* palette mode emulation or system         */
+    Uint32 depth;	            /* current visual depth (not bpp)           */
+    Uint32 desktopbpp;              /* bpp of desktop at the moment of start    */
+    Uint32 desktoppal;              /* palette mode emulation or system         */
 
     int currently_fullscreen;
     int currently_hided;        /* 1 - window hided (minimazed), 0 - normal */
@@ -107,7 +109,6 @@
 
 #define mode_settings        (this->hidden->mode_settings)
 #define window	             (this->hidden->Window)
-#define oglctx               (this->hidden->OGLContext)
 #define SDL_Image            (this->hidden->image)
 #define OCImage              (this->hidden->ocimage)
 #define old_video_mode       (this->hidden->old_video_mode)
@@ -122,9 +123,13 @@
 #define event                (this->hidden->event)
 #define current_overlay      (this->hidden->overlay)
 #define desktop_mode         (this->hidden->desktop_mode)
-
-/* Old variable names */
 #define mouse_relative       (this->hidden->mouse_relative)
 #define SDL_BlankCursor      (this->hidden->BlankCursor)
 
+#ifdef HAVE_OPENGL
+     #define oglctx               (this->hidden->OGLContext)
+     #define oglflags             (this->hidden->OGLFlags)
+     #define oglbpp               (this->hidden->OGLBPP)
+#endif /* HAVE_OPENGL */
+
 #endif /* __SDL_PH_VIDEO_H__ */