File compiz-ldpreload-indirect.diff of Package compiz

Overview Repositories Revisions Requests Users Attributes Meta

File compiz-ldpreload-indirect.diff of Package compiz (Revision 2a03578ae8d311e5b246cc4ed763ad20)

Currently displaying revision 2a03578ae8d311e5b246cc4ed763ad20 , Show latest

diff --git a/src/display.c b/src/display.c
index a988b38..cb3cb5f 100644
--- a/src/display.c
+++ b/src/display.c
@@ -43,6 +43,8 @@
 
 #include <compiz.h>
 
+extern Bool noLibGLFallback;
+
 static unsigned int virtualModMask[] = {
     CompAltMask, CompMetaMask, CompSuperMask, CompHyperMask,
     CompModeSwitchMask, CompNumLockMask, CompScrollLockMask
@@ -1994,6 +1996,17 @@ addDisplay (char *name)
 					     COMP_DISPLAY_OPTION_NUM))
 	return FALSE;
 
+    if (!noLibGLFallback)
+    {
+	int major, minor;
+
+	if (!glXQueryVersion (dpy, &major, &minor))
+	    return FALSE;
+
+	if (major < 2 || minor < 4)
+	    return FALSE;
+    }
+
     snprintf (d->displayString, 255, "DISPLAY=%s", DisplayString (dpy));
 
 #ifdef DEBUG
diff --git a/src/main.c b/src/main.c
index f6e5b26..6783781 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,6 +67,8 @@ Bool onlyCurrentScreen = FALSE;
 Bool useCow = TRUE;
 #endif
 
+Bool noLibGLFallback = FALSE;
+
 CompMetadata coreMetadata;
 
 static void
@@ -378,6 +380,10 @@ main (int argc, char **argv)
 	    if (i + 1 < argc)
 		backgroundImage = argv[++i];
 	}
+	else if (!strcmp (argv[i], "--no-libgl-fallback"))
+	{
+	    noLibGLFallback = TRUE;
+	}
 	else if (*argv[i] == '-')
 	{
 	    compLogMessage (NULL, "core", CompLogLevelWarn,
@@ -390,6 +396,9 @@ main (int argc, char **argv)
 	}
     }
 
+    if (noLibGLFallback)
+	unsetenv ("LD_PRELOAD");
+
     if (refreshRateArg)
     {
 	ctx.refreshRateData = malloc (strlen (refreshRateArg) + 256);
@@ -448,8 +457,24 @@ main (int argc, char **argv)
 	initSession (clientId);
 
     if (!addDisplay (displayName))
-	return 1;
+    {
+	if (!noLibGLFallback)
+	{
+	    char *arg[argc + 2];
+	    static const char *libindirect_libgl = "/usr/$LIB/libIndirectGL.so.1";
 
+	    memcpy (arg, argv, sizeof (char *) * argc);
+
+	    arg[argc] = "--no-libgl-fallback";
+	    arg[argc + 1] = NULL;
+
+	    fprintf (stderr, "%s: Trying '%s'\n", programName, libindirect_libgl);
+
+	    setenv ("LD_PRELOAD", libindirect_libgl, TRUE);
+	    execvp (arg[0], arg);
+	}
+	return 1;
+    }
     eventLoop ();
 
     if (!disableSm)

Places

File compiz-ldpreload-indirect.diff of Package compiz (Revision 2a03578ae8d311e5b246cc4ed763ad20)

Places