Renamed mod_brush to mod_brushq1.

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index b175bbcb612c9438947291e670a39cc8c3939a4f..7e670a13c3d2068c8529a0043c415784dc505e45 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -35,13 +35,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <X11/cursorfont.h>
 
 #include <X11/extensions/XShm.h>
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__MACH__)
 #include <X11/extensions/xf86dga.h>
 #endif
 #include <X11/extensions/xf86vmode.h>
 
 #include "quakedef.h"
 
+// Tell startup code that we have a client
 int cl_available = true;
 
 //GLX prototypes
@@ -266,7 +267,7 @@ static void install_grabs(void)
                if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
                {
                        // unable to query, probalby not supported
-                       Con_Printf( "Failed to detect XF86DGA Mouse\n" );
+                       Con_Print( "Failed to detect XF86DGA Mouse\n" );
                        vid_dga.integer = 0;
                }
                else
@@ -606,7 +607,8 @@ void VID_Finish (void)
        int usemouse;
        if (r_render.integer)
        {
-               qglFinish();
+               if (r_speeds.integer || gl_finish.integer)
+                       qglFinish();
                qglXSwapBuffers(vidx11_display, win);
        }
 
@@ -683,7 +685,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        int MajorVersion, MinorVersion;
        const char *drivername;
 
+#if defined(__APPLE__) && defined(__MACH__)
+       drivername = "/usr/X11R6/lib/libGL.1.dylib";
+#else
        drivername = "libGL.so.1";
+#endif
        i = COM_CheckParm("-gl_driver");
        if (i && i < com_argc - 1)
                drivername = com_argv[i + 1];
@@ -695,7 +701,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
        if (!(vidx11_display = XOpenDisplay(NULL)))
        {
-               Con_Printf("Couldn't open the X display\n");
+               Con_Print("Couldn't open the X display\n");
                return false;
        }
 
@@ -726,7 +732,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
        if (!visinfo)
        {
-               Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
+               Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n");
                return false;
        }