*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40310

README.QNX

 README by Mike Gorchak <mike@malva.ua>
 
-    OpenGL support was experimentally added in window mode (in
-fullscreen mode not yet). If you have QNX RtP v6.1.0 w/ or w/o
-Patch A you must download new Photon3D runtime from http://de-
-velopers.qnx.com. The versions of OS before 6.1.0 are not sup-
-ported.
+    OpenGL in window mode  works well  and  stable, in fullscreen
+mode too, but fullscreen mode has not been heavily tested.
+    If you have QNX RtP 6.1.0 w/ or w/o Patch A you must download
+new Photon3D runtime from http://developers.qnx.com. The versions
+of OS before 6.1.0 are not supported.
 
 Problems:
-1. Fullscreen mode (in OpenGL mode) has not been  written yet.
-2. Photon has some errors in detecting  how much bits  per pi-
-   xel videomode has.
+1. While creating OpenGL context artificially  selected  software
+   renderer mode (QSSL made acceleration only for  Voodoo  boards
+   in fullscreen mode, sorry but I don't have this board, if  you
+   want acceleration - you may remove some line in source).
+2. Photon has some errors in detecting  how  much bits  per pixel
+   videomode has.
 3. No  shared  libraries  yet.  We  need  manually  set  flag  to
    'configure' --disable-shared.
 

src/video/photon/SDL_ph_modes.c

@@ -176,11 +176,9 @@ SDL_Rect **ph_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
     {
         if (PgGetVideoModeInfo(mode_list.modes[i], &mode_info) < 0)
         {
-                fprintf(stderr,"error: PgGetVideoModeInfo failed on mode: 0x%x\n",
-                        mode_list.modes[i]);
+            fprintf(stderr,"error: PgGetVideoModeInfo failed on mode: 0x%x\n", mode_list.modes[i]);
             return NULL;
         }
-
         if(mode_info.bits_per_pixel == format->BitsPerPixel)
         {
             Amodelist[j].w = mode_info.width;
@@ -191,9 +189,9 @@ SDL_Rect **ph_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
         }
     }
 	
-	//reorder biggest for smallest, assume width dominates
+    /* reorder biggest for smallest, assume width dominates */
 
-	for(i=0; i< j ; i++)
+    for(i=0; i<j; i++)
     {
         SDL_modelist[i].w = Amodelist[j - i -1].w;
         SDL_modelist[i].h = Amodelist[j - i -1].h;
@@ -281,65 +279,36 @@ static void set_best_resolution(_THIS, int width, int height)
     }
 }
 
-/*
-static void get_real_resolution(_THIS, int* w, int* h)
-{
-
-    if ( use_vidmode ) {
-        //PgDisplaySettings_t settings;
-	    PgVideoModeInfo_t		current_mode_info;
-	    	PgHWCaps_t my_hwcaps;
-//        int unused;
-		
-//        if (PgGetVideoMode( &settings ) >= 0) {
-//			*w = settings.xres;
-//			*h = settings.yres;
-//            return;
-//        }
-            if (PgGetGraphicsHWCaps(&my_hwcaps) >= 0)
-         	{
-                 if (PgGetVideoModeInfo(my_hwcaps.current_video_mode, &current_mode_info) < 0)
-           		 {
-                fprintf(stderr,"get_real_resolution:  PgGetVideoModeInfo failed\n");
-            		 }
-				*w = current_mode_info.width;
-				*h = current_mode_info.height;            
-            }
-    }
-//    *w = DisplayWidth(SDL_Display, SDL_Screen);
-//    *h = DisplayHeight(SDL_Display, SDL_Screen);
-}
-*/
-
 int ph_ResizeFullScreen(_THIS)
 {
-
-    if ( currently_fullscreen ) {
+    if (currently_fullscreen) {
         set_best_resolution(this, current_w, current_h);
     }
-    return(1);
+    return (1);
 }
 
-int get_mode(int width, int height, int bpp)
 /* return the mode associated with width, height and bpp */
 /* if there is no mode then zero is returned             */
+int get_mode(int width, int height, int bpp)
 {
     int i;
 
+    if(width<640)
+    {
+        width=640;
+    }
+    if(height<480)
+    {
+        height=480;
+    }
 
-if(width <640)
-   width = 640;
-if(height < 480)
-  height = 480;
-
-
-	if (PgGetVideoModeList( &mode_list ) < 0)
+    if (PgGetVideoModeList(&mode_list) < 0)
     {
         fprintf(stderr,"error: PgGetVideoModeList failed\n");
         return -1;
     }
 
-	// search list for exact match
+    /* search list for exact match */
     for (i=0;i<mode_list.num_modes;i++)
     {
         if (PgGetVideoModeInfo(mode_list.modes[i], &mode_info) < 0)
@@ -348,7 +317,6 @@ if(height < 480)
             return 0;
         }
 
-		
         if ((mode_info.width == width) && 
             (mode_info.height == height) && 
             (mode_info.bits_per_pixel == bpp))
@@ -356,6 +324,7 @@ if(height < 480)
             return mode_list.modes[i];
         }
     }
+
     return (i == mode_list.num_modes) ? 0 : mode_list.modes[i];
 }
 
@@ -430,21 +399,30 @@ void ph_QueueEnterFullScreen(_THIS);
 
 int ph_ToggleFullScreen(_THIS, int on)
 {
-
-   if(currently_fullscreen)
-        ph_LeaveFullScreen(this);
+    if (currently_fullscreen)
+    {
+        return ph_LeaveFullScreen(this);
+    }
     else
-        ph_EnterFullScreen(this);
+    {
+        return ph_EnterFullScreen(this);
+    }
       
     return 0;     
-
 }
 
 int ph_EnterFullScreen(_THIS)
 {
-	if ( ! currently_fullscreen ) 
+    if (!currently_fullscreen)
+    {
+        if ((this->screen->flags & SDL_OPENGL)==SDL_OPENGL)
+        {
+#ifdef HAVE_OPENGL
+#endif /* HAVE_OPENGL */
+           return 0;
+        }
+        else
         {
-
             if (old_video_mode==-1)
             {
                 PgGetGraphicsHWCaps(&graphics_card_caps);
@@ -452,26 +430,20 @@ int ph_EnterFullScreen(_THIS)
                 old_refresh_rate=graphics_card_caps.current_rrate;
             }
 
-
             if(OCImage.direct_context == NULL)
+            {
                 OCImage.direct_context=(PdDirectContext_t*)PdCreateDirectContext();
-        if( !OCImage.direct_context )
+            }
+            if(!OCImage.direct_context)
+            {
                 fprintf(stderr, "error: Can't create direct context\n" );
+            }
 
-       
-		/* Remove the cursor if in full screen mode */		
-/*
-		region_info.cursor_type = Ph_CURSOR_NONE;
-		region_info.rid=PtWidgetRid(window);
-		PhRegionChange(Ph_REGION_CURSOR,0,&region_info,NULL,NULL);
-*/
-
-	 	PdDirectStart( OCImage.direct_context );
+            PdDirectStart(OCImage.direct_context);
 
             currently_fullscreen = 1;
         }
-
-
+    }
 
     return 1;
 }
@@ -480,18 +452,26 @@ int ph_LeaveFullScreen(_THIS )
 {
     PgDisplaySettings_t mymode_settings;
        
-	if ( currently_fullscreen )
+    if (currently_fullscreen)
+    {
+        if ((this->screen->flags & SDL_OPENGL)==SDL_OPENGL)
+        {
+#ifdef HAVE_OPENGL
+#endif /* HAVE_OPENGL */
+           return 0;
+        }
+        else
         {
             PdDirectStop(OCImage.direct_context);
             PdReleaseDirectContext(OCImage.direct_context);
 
-		//Restore old video mode	
+            /* Restore old video mode */
             if (old_video_mode != -1)
             {
                 mymode_settings.mode= (unsigned short) old_video_mode;
                 mymode_settings.refresh= (unsigned short) old_refresh_rate;
                 mymode_settings.flags = 0;
-			if(PgSetVideoMode(&mymode_settings) < 0)
+                if (PgSetVideoMode(&mymode_settings) < 0)
                 {
                     fprintf(stderr,"error: PgSetVideoMode failed\n");
                 }
@@ -499,8 +479,7 @@ int ph_LeaveFullScreen(_THIS )
 
             old_video_mode=-1;
             old_refresh_rate=-1;	
-	
-		// Restore cursor	
+        }
 
     }
     return 1;

src/video/photon/SDL_ph_video.h

@@ -19,26 +19,6 @@
     Sam Lantinga
     slouken@libsdl.org
 */
-/*
-static PhEvent_t *event;
-static PtAppContext_t app;
-static PtWidget_t *window;
-static PgVideoModes_t modelist;
-static PdOffscreenContext_t *Buff[2];
-static PdDirectContext_t *directContext;
-static PhRect_t screenRect,windowRect;
-static PgColor_t currRGB;
-static PhPoint_t zeroPoint;
-static char keyque[ QUE_SIZE ],keyMatrix[256];
-static int queput,queget;
-static int modeSet;
-static PgHWCaps_t hwCaps;
-static PgDisplaySettings_t mode_settings;
-static int rshift1,rshift2,gshift1,gshift2,bshift1,bshift2;
-static int backPitch;
-static unsigned RBitMask,GBitMask,BBitMask;
-static unsigned TranslatedFillColor;
-*/
 
 #ifndef _SDL_ph_video_h
 #define _SDL_ph_video_h
@@ -50,7 +30,9 @@ static unsigned TranslatedFillColor;
 #include "Pt.h"
 #include <photon/Pg.h>
 #include <photon/PdDirect.h>
+#ifdef HAVE_OPENGL
 #include <photon/PdGL.h>
+#endif /* HAVE_OPENGL */
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_VideoDevice *this
@@ -76,8 +58,11 @@ struct SDL_PrivateVideoData {
     int local_ph;		/* Flag: true if local display */
     PtAppContext_t app;
     PgDisplaySettings_t mode_settings;	
-    PtWidget_t *window;    /* used to handle input events */
+    PtWidget_t *Window;    /* used to handle input events */
     PhImage_t *image;	   /* used to display image */
+#ifdef HAVE_OPENGL
+    PdOpenGLContext_t* OGLContext;
+#endif /* HAVE_OPENGL */
 
     struct {
         PdDirectContext_t *direct_context;
@@ -100,8 +85,6 @@ struct SDL_PrivateVideoData {
     PdOffscreenContext_t *Buff[2];
     struct _Ph_ctrl* ctrl_channel;
 
-	PhGC_t *Pt_GC, *Pg_GC; /* Graphic contexts to switch between Pt and Pg APIs */
-
     /* The variables used for displaying graphics */
 
     /* The current width and height of the fullscreen mode */
@@ -113,16 +96,16 @@ struct SDL_PrivateVideoData {
         int x;
         int y;
     } mouse_last;
+
     struct {
         int numerator;
         int denominator;
         int threshold;
     } mouse_accel;
+
     int mouse_relative;
     WMcursor* BlankCursor;
 
-  
-
     int depth;			/* current visual depth (not bpp) */
 
     int use_vidmode;
@@ -142,7 +125,8 @@ struct SDL_PrivateVideoData {
 #define local_ph             (this->hidden->local_ph)
 #define app                  (this->hidden->app)
 #define mode_settings        (this->hidden->mode_settings)
-#define window			(this->hidden->window)
+#define window	             (this->hidden->Window)
+#define oglctx               (this->hidden->OGLContext)
 #define directContext	     (this->hidden->directContext)
 #define Buff                 (this->hidden->Buff)
 #define ctrl_channel         (this->hidden->ctrl_channel)
@@ -151,8 +135,6 @@ struct SDL_PrivateVideoData {
 #define old_video_mode       (this->hidden->old_video_mode)
 #define old_refresh_rate     (this->hidden->old_refresh_rate)
 #define graphics_card_caps   (this->hidden->graphics_card_caps)
-#define Pt_GC			(this->hidden->Pt_GC)
-#define Pg_GC			(this->hidden->Pg_GC)
 
 /* Old variable names */
 #define swap_pixels          (this->hidden->swap_pixels)