X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fx11%2Ffreeglut_window_x11.c;h=f4d50e1105564c432eb3921967e88192de9fe7b0;hb=5a3e5c7b7749ca1b3de57591c90d6424d1dd4b86;hp=cf487116666614b5f09e5689c23f65c3f0a08c18;hpb=ef90e5c72102f31823452430eb0b704dd3a44113;p=freeglut

diff --git a/src/x11/freeglut_window_x11.c b/src/x11/freeglut_window_x11.c
index cf48711..f4d50e1 100644
--- a/src/x11/freeglut_window_x11.c
+++ b/src/x11/freeglut_window_x11.c
@@ -30,7 +30,7 @@
 #include <GL/freeglut.h>
 #include <limits.h>  /* LONG_MAX */
 #include <unistd.h>  /* usleep */
-#include "freeglut_internal.h"
+#include "../Common/freeglut_internal.h"
 
 /* pushing attribute/value pairs into an array */
 #define ATTRIB(a) attributes[where++]=(a)
@@ -86,7 +86,7 @@
  * Chooses a visual basing on the current display mode settings
  */
 
-GLXFBConfig* fgChooseFBConfig( int *numcfgs )
+GLXFBConfig* fgPlatformChooseFBConfig( int *numcfgs )
 {
   GLboolean wantIndexedMode = GL_FALSE;
   int attributes[ 100 ];
@@ -304,7 +304,7 @@ static GLXContext fghCreateNewContext( SFG_Window* window )
 
   /* new context creation */
   int attributes[9];
-  CreateContextAttribsProc createContextAttribs = (CreateContextAttribsProc) fghGetProcAddress( "glXCreateContextAttribsARB" );
+  CreateContextAttribsProc createContextAttribs = (CreateContextAttribsProc) fgPlatformGetProcAddress( "glXCreateContextAttribsARB" );
  
   /* glXCreateContextAttribsARB not found, yet the user has requested the new context creation */
   if ( !createContextAttribs && !fghIsLegacyContextRequested() ) {
@@ -451,7 +451,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )
         fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;
 
-    window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+    window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );
 
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )
         fgState.DisplayMode = current_DisplayMode ;
@@ -459,21 +459,21 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     if( ! window->Window.pContext.FBConfig )
     {
         /*
-         * The "fgChooseFBConfig" returned a null meaning that the visual
+         * The "fgPlatformChooseFBConfig" returned a null meaning that the visual
          * context is not available.
          * Try a couple of variations to see if they will work.
          */
         if( !( fgState.DisplayMode & GLUT_DOUBLE ) )
         {
             fgState.DisplayMode |= GLUT_DOUBLE ;
-            window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+            window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );
             fgState.DisplayMode &= ~GLUT_DOUBLE;
         }
 
         if( fgState.DisplayMode & GLUT_MULTISAMPLE )
         {
             fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
-            window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+            window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );
             fgState.DisplayMode |= GLUT_MULTISAMPLE;
         }
     }