summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-02-13 23:21:21 +0000
committerAdam Jackson <ajax@nwnk.net>2006-02-13 23:21:21 +0000
commit230554bb5e1053afb42e06ba71aaf8a639128de6 (patch)
treea5608a554c7b2911bb1b16a7551413638970cbcc
parent806db5e7f9bc3c65e596a78aa0b9e59fba911cc1 (diff)
Minimal hack to enable EXT_texture_from_pixmap.XORG-7_0_99_901
-rw-r--r--ChangeLog7
-rw-r--r--src/screen.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ffc2f2a..bb25336 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-01-18 Adam Jackson <ajax@freedesktop.org>
+2006-02-13 Adam Jackson <ajax@freedesktop.org>
+
+ * src/screen.c:
+ Minimal hack to enable EXT_texture_from_pixmap.
+
+2006-01-18 Adam Jackson <ajax@freedesktop.org>
* include/comp.h:
* src/screen.c:
diff --git a/src/screen.c b/src/screen.c
index 8c68027..b2daa07 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -681,7 +681,8 @@ addScreen (CompDisplay *display,
glxExtensions = glXQueryExtensionsString (s->display->display, screenNum);
if (!testMode && !strstr (glxExtensions, "GLX_MESA_render_texture")
- && !strstr(glxExtensions, "GLX_EXT_texture_from_drawable"))
+ && !strstr(glxExtensions, "GLX_EXT_texture_from_drawable")
+ && !strstr(glxExtensions, "GLX_EXT_texture_from_pixmap"))
{
fprintf (stderr, "%s: GLX_MESA_render_texture is missing\n",
programName);