Moving the Windows platform-specific "SwapBuffers" calls into a Windows platform...

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

diff --git a/src/Common/freeglut_display.c b/src/Common/freeglut_display.c
index f13319c..086d24a 100644 (file)
--- a/src/Common/freeglut_display.c
+++ b/src/Common/freeglut_display.c
@@ -28,6 +28,18 @@
 #include <GL/freeglut.h>\r
 #include "freeglut_internal.h"\r
 \r
+\r
+/* Function prototypes */\r
+extern void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow );\r
+\r
+\r
+#if TARGET_HOST_POSIX_X11\r
+void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )\r
+{\r
+    glXSwapBuffers( pDisplayPtr->Display, CurrentWindow->Window.Handle );\r
+}\r
+#endif\r
+\r
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */\r
 \r
 /*\r
@@ -61,11 +73,7 @@ void FGAPIENTRY glutSwapBuffers( void )
     if( ! fgStructure.CurrentWindow->Window.DoubleBuffered )\r
         return;\r
 \r
-#if TARGET_HOST_POSIX_X11\r
-    glXSwapBuffers( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle );\r
-#elif TARGET_HOST_MS_WINDOWS\r
-    SwapBuffers( fgStructure.CurrentWindow->Window.Device );\r
-#endif\r
+    fgPlatformGlutSwapBuffers( &fgDisplay.pDisplay, fgStructure.CurrentWindow );\r
 \r
     /* GLUT_FPS env var support */\r
     if( fgState.FPSInterval )\r

diff --git a/src/mswin/freeglut_display_mswin.c b/src/mswin/freeglut_display_mswin.c
index e69de29..9437382 100644 (file)
--- a/src/mswin/freeglut_display_mswin.c
+++ b/src/mswin/freeglut_display_mswin.c
@@ -0,0 +1,37 @@
+/*\r
+ * freeglut_display_mswin.c\r
+ *\r
+ * The Windows-specific mouse cursor related stuff.\r
+ *\r
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.\r
+ * Written by John F. Fay, <fayjf@sourceforge.net>\r
+ * Creation date: Sat Jan 28, 2012\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a\r
+ * copy of this software and associated documentation files (the "Software"),\r
+ * to deal in the Software without restriction, including without limitation\r
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,\r
+ * and/or sell copies of the Software, and to permit persons to whom the\r
+ * Software is furnished to do so, subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included\r
+ * in all copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS\r
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\r
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ */\r
+\r
+#include <GL/freeglut.h>\r
+#include "../Common/freeglut_internal.h"\r
+\r
+\r
+\r
+\r
+void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )\r
+{\r
+    SwapBuffers( CurrentWindow->Window.Device );\r
+}\r