debian/changelog | 4 ++-
debian/patches/015_optional-fbo.patch | 44 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 66858e79139c0a63a1d58a0826d9fc60026b23d7
Author: Thierry Reding <[EMAIL PROTECTED]>
Date: Wed Jan 3 12:41:45 2007 +0100
Add patch to add a command-line option for making the use of FBOs optional.
Some DRI drivers seem to be buggy when it comes to FBO support. This option
can be used to work around such drivers.
diff --git a/debian/changelog b/debian/changelog
index f0f50b4..8125bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ compiz (0.3.6-1) experimental; urgency=l
be used to write additional decorators.
* Add patch 014_tfp-server-extension that makes compiz look for
GLX_EXT_texture_from_pixmap in the server extensions too.
+ * Add patch 015_optional-fbo which adds a command-line option for disabling
+ the use of FBOs (work around buggy drivers).
- -- Thierry Reding <[EMAIL PROTECTED]> Wed, 3 Jan 2007 11:23:11 +0100
+ -- Thierry Reding <[EMAIL PROTECTED]> Wed, 3 Jan 2007 12:39:23 +0100
compiz (0.3.4-1) experimental; urgency=low
diff --git a/debian/patches/015_optional-fbo.patch
b/debian/patches/015_optional-fbo.patch
new file mode 100644
index 0000000..011181e
--- /dev/null
+++ b/debian/patches/015_optional-fbo.patch
@@ -0,0 +1,44 @@
+diff --git a/src/main.c b/src/main.c
+index bf1d5d1..4f5bab3 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -81,6 +81,7 @@ Bool replaceCurrentWm = FALSE;
+ Bool indirectRendering = FALSE;
+ Bool strictBinding = TRUE;
+ Bool noDetection = FALSE;
++Bool noFBO = FALSE;
+
+ #ifdef USE_COW
+ Bool useCow = TRUE;
+@@ -100,6 +101,7 @@ usage (void)
+ "[--sm-disable] "
+ "[--sm-client-id ID] "
+ "[--no-detection] "
++ "[--no-fbo] "
+ "[--version]\n "
+
+ #ifdef USE_COW
+@@ -196,6 +198,10 @@ main (int argc, char **argv)
+ {
+ strictBinding = FALSE;
+ }
++ else if (!strcmp (argv[i], "--no-fbo"))
++ {
++ noFBO = TRUE;
++ }
+
+ #ifdef USE_COW
+ else if (!strcmp (argv[i], "--use-root-window"))
+diff --git a/src/screen.c b/src/screen.c
+index f0b93e1..db6dad1 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -1804,7 +1804,7 @@ addScreen (CompDisplay *display,
+ }
+
+ s->fbo = 0;
+- if (strstr (glExtensions, "GL_EXT_framebuffer_object"))
++ if (!noFBO && strstr (glExtensions, "GL_EXT_framebuffer_object"))
+ {
+ s->genFramebuffers = (GLGenFramebuffersProc)
+ getProcAddress (s, "glGenFramebuffersEXT");
diff --git a/debian/patches/series b/debian/patches/series
index 451c06f..bf6a47f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
012_debian-kde-includes-dir.patch
013_set-qtdir-fallback.patch
014_tfp-server-extension.patch
+015_optional-fbo.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
