about summary refs log tree commit diff
path: root/pkgs/applications/window-managers/compiz/tfp-server-extension.patch
blob: 51910b5d0574c119fa9c46b7cfa9ac1e58632235 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
diff -rc compiz-0.5.0-orig/src/screen.c compiz-0.5.0/src/screen.c
*** compiz-0.5.0-orig/src/screen.c	2007-04-02 20:15:30.000000000 +0200
--- compiz-0.5.0/src/screen.c	2007-04-18 21:52:43.000000000 +0200
***************
*** 1533,1539 ****
      Window		 *children;
      unsigned int	 nchildren;
      int			 defaultDepth, nvisinfo, nElements, value, i;
!     const char		 *glxExtensions, *glExtensions;
      XSetWindowAttributes attrib;
      GLfloat		 globalAmbient[]  = { 0.1f, 0.1f,  0.1f, 0.1f };
      GLfloat		 ambientLight[]   = { 0.0f, 0.0f,  0.0f, 0.0f };
--- 1533,1540 ----
      Window		 *children;
      unsigned int	 nchildren;
      int			 defaultDepth, nvisinfo, nElements, value, i;
!     const char		 *glxExtensions = NULL, *glExtensions;
!     const char           *glxServerExtensions = NULL;
      XSetWindowAttributes attrib;
      GLfloat		 globalAmbient[]  = { 0.1f, 0.1f,  0.1f, 0.1f };
      GLfloat		 ambientLight[]   = { 0.0f, 0.0f,  0.0f, 0.0f };
***************
*** 1793,1800 ****
  	if (glXIsDirect (dpy, s->ctx) == indirectRendering)
  	    i++;
  
  	glxExtensions = glXQueryExtensionsString (dpy, screenNum);
! 	if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap"))
  	{
  	    if (i > 0)
  	    {
--- 1794,1805 ----
  	if (glXIsDirect (dpy, s->ctx) == indirectRendering)
  	    i++;
  
+ 	glxServerExtensions = glXQueryServerString(dpy,
+                                                screenNum, GLX_EXTENSIONS );
  	glxExtensions = glXQueryExtensionsString (dpy, screenNum);
! 	
! 	if (!strstr (indirectRendering ? glxServerExtensions : glxExtensions, 
!                      "GLX_EXT_texture_from_pixmap"))
  	{
  	    if (i > 0)
  	    {