Completed removal of all support for the offscreen rendering.

If you wish to do offscreen supportin a portable manner, you will
no longer be able to do so with current versions of freeglut.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@481 7f0cb862-5218-0410-a997-914c9d46530a

freeglut/freeglut/configure.in

@@ -67,7 +67,6 @@ AC_OUTPUT(\
 	progs/demos/Fractals_random/Makefile \
 	progs/demos/Lorenz/Makefile \
 	progs/demos/One/Makefile \
-	progs/demos/offscreen/Makefile \
 	progs/demos/shapes/Makefile \
 	src/Makefile \
 	include/Makefile \

freeglut/freeglut/include/GL/freeglut_ext.h

@@ -45,11 +45,6 @@
 #define GLUT_CREATE_NEW_CONTEXT                  0
 #define GLUT_USE_CURRENT_CONTEXT                 1
 
-/*
- * GLUT API Extension macro definitions -- display mode
- */
-#define GLUT_OFFSCREEN                      0x0400
-
 /*
  * GLUT API Extension macro definitions -- the glutGet parameters
  */

freeglut/freeglut/src/freeglut_internal.h

@@ -376,7 +376,6 @@ struct tagSFG_WindowState
 
     GLboolean       IsGameMode;         /* Is this the game mode window?     */
     GLboolean       NeedToResize;       /* Do we need to resize the window?  */
-    GLboolean       IsOffscreen;        /* Tags a `window' as on/offscreen.  */
 };
 
 

freeglut/freeglut/src/freeglut_window.c

@@ -308,28 +308,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
      */
     assert( window->Window.VisualInfo != NULL );
 
-    window->State.IsOffscreen = GL_FALSE;
+
-    if( fgState.DisplayMode & GLUT_OFFSCREEN )
-    {
-        window->State.IsOffscreen = GL_TRUE;
-        window->Window.Pixmap = XCreatePixmap(
-            fgDisplay.Display, fgDisplay.RootWindow,
-            w, h,
-            window->Window.VisualInfo->depth
-        );
-        if( False != window->Window.Pixmap )
-        {
-            window->Window.Handle = glXCreateGLXPixmap(
-                fgDisplay.Display,
-                window->Window.VisualInfo,
-                window->Window.Pixmap
-            );
-            if( False == window->Window.Handle )
-                XFreePixmap( fgDisplay.Display, window->Window.Pixmap );
-        }
-    }
-    else
-    {
     /*
      * XXX HINT: the masks should be updated when adding/removing callbacks.
      * XXX       This might speed up message processing. Is that true?
@@ -356,7 +335,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 
     mask = CWBackPixmap | CWBorderPixel | CWColormap | CWEventMask;
 
-        if ( window->IsMenu )
+    if( window->IsMenu )
     {
         winAttr.override_redirect = True;
         mask |= CWOverrideRedirect;
@@ -371,7 +350,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
         window->Window.VisualInfo->visual, mask,
         &winAttr
     );
-    }
+
     /*
      * The GLX context creation, possibly trying the direct context rendering
      *  or else use the current context if the user has so specified
@@ -453,8 +432,6 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 
     wmHints.flags = StateHint;
     wmHints.initial_state = fgState.ForceIconic ? IconicState : NormalState;
-    if( GL_FALSE == window->State.IsOffscreen )
-    {
     /*
      * Prepare the window and iconified window names...
      */
@@ -476,7 +453,6 @@ void fgOpenWindow( SFG_Window* window, const char* title,
                      &fgDisplay.DeleteWindow, 1 );
 
     XMapWindow( fgDisplay.Display, window->Window.Handle );
-    }
 
 #elif TARGET_HOST_WIN32
 
@@ -588,13 +564,9 @@ void fgCloseWindow( SFG_Window* window )
 #if TARGET_HOST_UNIX_X11
 
     glXDestroyContext( fgDisplay.Display, window->Window.Context );
-    if( GL_FALSE == window->State.IsOffscreen )
-        XDestroyWindow( fgDisplay.Display, window->Window.Handle );
-    else
-    {
     glXDestroyGLXPixmap( fgDisplay.Display, window->Window.Handle );
     XFreePixmap( fgDisplay.Display, window->Window.Pixmap );
-    }
+
     XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
 
 #elif TARGET_HOST_WIN32
@@ -650,8 +622,6 @@ int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
 {
     int ret = 0;
 
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
-    {
     SFG_Window* window = NULL;
     SFG_Window* parent = NULL;
 
@@ -660,7 +630,7 @@ int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
     freeglut_return_val_if_fail( parent != NULL, 0 );
     window = fgCreateWindow( parent, "", x, y, w, h, GL_FALSE, GL_FALSE );
     ret = window->ID;
-    }
+
     return ret;
 }
 
@@ -719,8 +689,6 @@ void FGAPIENTRY glutShowWindow( void )
     freeglut_assert_ready;
     freeglut_assert_window;
 
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
-    {
 #if TARGET_HOST_UNIX_X11
 
     XMapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
@@ -731,7 +699,7 @@ void FGAPIENTRY glutShowWindow( void )
     ShowWindow( fgStructure.Window->Window.Handle, SW_SHOW );
 
 #endif
-    }
+
     fgStructure.Window->State.Redisplay = GL_TRUE;
 }
 
@@ -743,8 +711,6 @@ void FGAPIENTRY glutHideWindow( void )
     freeglut_assert_ready;
     freeglut_assert_window;
 
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
-    {
 #if TARGET_HOST_UNIX_X11
 
     if( fgStructure.Window->Parent == NULL )
@@ -761,7 +727,7 @@ void FGAPIENTRY glutHideWindow( void )
     ShowWindow( fgStructure.Window->Window.Handle, SW_HIDE );
 
 #endif
-    }
+
     fgStructure.Window->State.Redisplay = GL_FALSE;
 }
 
@@ -774,8 +740,6 @@ void FGAPIENTRY glutIconifyWindow( void )
     freeglut_assert_window;
 
     fgStructure.Window->State.Visible   = GL_FALSE;
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
-    {
 #if TARGET_HOST_UNIX_X11
 
     XIconifyWindow( fgDisplay.Display, fgStructure.Window->Window.Handle,
@@ -787,7 +751,7 @@ void FGAPIENTRY glutIconifyWindow( void )
     ShowWindow( fgStructure.Window->Window.Handle, SW_MINIMIZE );
 
 #endif
-    }
+
     fgStructure.Window->State.Redisplay = GL_FALSE;
 }
 
@@ -798,8 +762,7 @@ void FGAPIENTRY glutSetWindowTitle( const char* title )
 {
     freeglut_assert_ready;
     freeglut_assert_window;
-    if( ! fgStructure.Window->Parent &&
+    if( ! fgStructure.Window->Parent )
-        ( GL_FALSE == fgStructure.Window->State.IsOffscreen ) )
     {
 #if TARGET_HOST_UNIX_X11
 
@@ -834,8 +797,7 @@ void FGAPIENTRY glutSetIconTitle( const char* title )
     freeglut_assert_ready;
     freeglut_assert_window;
 
-    if( ! fgStructure.Window->Parent &&
+    if( ! fgStructure.Window->Parent )
-        GL_FALSE == fgStructure.Window->State.IsOffscreen )
     {
 #if TARGET_HOST_UNIX_X11
 
@@ -870,13 +832,9 @@ void FGAPIENTRY glutReshapeWindow( int width, int height )
     freeglut_assert_ready;
     freeglut_assert_window;
 
-    /* XXX Could delete/create/set-window-id for offscreen. */
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
-    {
     fgStructure.Window->State.NeedToResize = GL_TRUE;
     fgStructure.Window->State.Width  = width ;
     fgStructure.Window->State.Height = height;
-    }
 }
 
 /*
@@ -887,8 +845,6 @@ void FGAPIENTRY glutPositionWindow( int x, int y )
     freeglut_assert_ready;
     freeglut_assert_window;
 
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
-    {
 #if TARGET_HOST_UNIX_X11
 
     XMoveWindow( fgDisplay.Display, fgStructure.Window->Window.Handle,
@@ -897,6 +853,7 @@ void FGAPIENTRY glutPositionWindow( int x, int y )
 
 #elif TARGET_HOST_WIN32
     
+    {
         RECT winRect;
 
         GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
@@ -908,9 +865,9 @@ void FGAPIENTRY glutPositionWindow( int x, int y )
             winRect.bottom - winRect.top,
             TRUE
         );
+    }
 
 #endif
-    }
 }
 
 /*
@@ -921,8 +878,6 @@ void FGAPIENTRY glutPushWindow( void )
     freeglut_assert_ready;
     freeglut_assert_window;
 
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
-    {
 #if TARGET_HOST_UNIX_X11
 
     XLowerWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
@@ -937,7 +892,6 @@ void FGAPIENTRY glutPushWindow( void )
     );
 
 #endif
-    }
 }
 
 /*
@@ -948,8 +902,6 @@ void FGAPIENTRY glutPopWindow( void )
     freeglut_assert_ready;
     freeglut_assert_window;
 
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
-    {
 #if TARGET_HOST_UNIX_X11
 
     XRaiseWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
@@ -964,7 +916,6 @@ void FGAPIENTRY glutPopWindow( void )
     );
 
 #endif
-    }
 }
 
 /*
@@ -975,7 +926,6 @@ void FGAPIENTRY glutFullScreen( void )
     freeglut_assert_ready;
     freeglut_assert_window;
 
-    if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
     {
 #if TARGET_HOST_UNIX_X11
         int x, y;