From: John F. Fay Date: Sat, 4 Feb 2012 17:11:50 +0000 (+0000) Subject: Moving X11-specific code from "freeglut_display.c" into its own file X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=ee696b7ee5011ba23716abe9ffaeb73c6cfac351;p=freeglut Moving X11-specific code from "freeglut_display.c" into its own file git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1048 7f0cb862-5218-0410-a997-914c9d46530a --- diff --git a/src/Common/freeglut_display.c b/src/Common/freeglut_display.c index 086d24a..8264949 100644 --- a/src/Common/freeglut_display.c +++ b/src/Common/freeglut_display.c @@ -33,13 +33,6 @@ extern void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow ); -#if TARGET_HOST_POSIX_X11 -void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow ) -{ - glXSwapBuffers( pDisplayPtr->Display, CurrentWindow->Window.Handle ); -} -#endif - /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ /* diff --git a/src/x11/freeglut_display_x11.c b/src/x11/freeglut_display_x11.c index e69de29..f03c064 100644 --- a/src/x11/freeglut_display_x11.c +++ b/src/x11/freeglut_display_x11.c @@ -0,0 +1,36 @@ +/* + * freeglut_display_x11.c + * + * Display message posting, context buffer swapping. + * + * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved. + * Written by Pawel W. Olszta, + * Copied for Platform code by Evan Felix + * Creation date: Thur Feb 2 2012 + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include "freeglut_internal.h" + +void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow ) +{ + glXSwapBuffers( pDisplayPtr->Display, CurrentWindow->Window.Handle ); +} +