X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_display.c;h=74a00361b91a0aa9c8e58a5f897f4ddf91d310dd;hb=9dac5d0710b760ba04ebb6bbe9ee61041232c700;hp=a2168a34911a5a9fe15626c4c26ba2687ab1e39a;hpb=e218a8c9e3bd45717847d9d63b052a6d0a7d1e67;p=freeglut diff --git a/src/freeglut_display.c b/src/freeglut_display.c index a2168a3..74a0036 100644 --- a/src/freeglut_display.c +++ b/src/freeglut_display.c @@ -29,7 +29,7 @@ #include "config.h" #endif -#include "../include/GL/freeglut.h" +#include #include "freeglut_internal.h" @@ -41,8 +41,8 @@ void FGAPIENTRY glutPostRedisplay( void ) { freeglut_assert_ready; - freeglut_assert_window; - fgStructure.Window->State.Redisplay = TRUE; + FREEGLUT_EXIT_IF_NO_WINDOW ( "glutPostRedisplay" ); + fgStructure.Window->State.Redisplay = GL_TRUE; } /* @@ -51,15 +51,15 @@ void FGAPIENTRY glutPostRedisplay( void ) void FGAPIENTRY glutSwapBuffers( void ) { freeglut_assert_ready; - freeglut_assert_window; + FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSwapBuffers" ); - glFlush(); - if ( ! fgStructure.Window->Window.DoubleBuffered ) + glFlush( ); + if( ! fgStructure.Window->Window.DoubleBuffered ) return; #if TARGET_HOST_UNIX_X11 glXSwapBuffers( fgDisplay.Display, fgStructure.Window->Window.Handle ); -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE SwapBuffers( fgStructure.Window->Window.Device ); #endif @@ -93,7 +93,7 @@ void FGAPIENTRY glutPostWindowRedisplay( int windowID ) freeglut_assert_ready; window = fgWindowByID( windowID ); freeglut_return_if_fail( window ); - window->State.Redisplay = TRUE; + window->State.Redisplay = GL_TRUE; } /*** END OF FILE ***/