Changeset 25383 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Dec 15, 2009 7:26:20 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix compiz on older gpus (#4404)

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• glx.c (modified) (13 diffs)
• load.c (modified) (2 diffs)
• stub.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/glx.c

@@ -1333 +1333 @@
 VBOXGLXTAG(glXCreatePixmap)(Display *dpy, GLXFBConfig config, Pixmap pixmap, const ATTRIB_TYPE *attrib_list)
 {
+    ATTRIB_TYPE *attrib;
+    XVisualInfo *pVis;
+    GLX_Pixmap_t *pGlxPixmap;
     (void) dpy;
     (void) config;
-    (void) attrib_list;
-
+
+    pGlxPixmap = crCalloc(sizeof(GLX_Pixmap_t));
+    if (!pGlxPixmap)
+    {
+        crWarning("glXCreatePixmap failed to allocate memory");
+        return 0;
+    }
+
+    pVis = VBOXGLXTAG(glXGetVisualFromFBConfig)(dpy, config);
+    if (!pVis)
+    {
+        crWarning("Unknown config 0x%x in glXCreatePixmap", (unsigned int) config);
+        return 0;
+    }
+
+    pGlxPixmap->format = pVis->depth==24 ? GL_RGB:GL_RGBA;
+    pGlxPixmap->target = GL_TEXTURE_2D;
+
+    if (attrib_list)
+    {
+        for (attrib = attrib_list; *attrib != None; attrib++)
+        {
+            switch (*attrib)
+            {
+                case GLX_TEXTURE_FORMAT_EXT:
+                    attrib++;
+                    switch (*attrib)
+                    {
+                        case GLX_TEXTURE_FORMAT_RGBA_EXT:
+                            pGlxPixmap->format = GL_RGBA;
+                            break;
+                        case GLX_TEXTURE_FORMAT_RGB_EXT:
+                            pGlxPixmap->format = GL_RGB;
+                            break;
+                        default:
+                            crDebug("Unexpected GLX_TEXTURE_FORMAT_EXT 0x%x", (unsigned int) *attrib);
+                    }
+                    break;
+                case GLX_TEXTURE_TARGET_EXT:
+                    attrib++;
+                    switch (*attrib)
+                    {
+                        case GLX_TEXTURE_2D_EXT:
+                            pGlxPixmap->target = GL_TEXTURE_2D;
+                            break;
+                        case GLX_TEXTURE_RECTANGLE_EXT:
+                            pGlxPixmap->target = GL_TEXTURE_RECTANGLE_NV;
+                            break;
+                        default:
+                            crDebug("Unexpected GLX_TEXTURE_TARGET_EXT 0x%x", (unsigned int) *attrib);
+                    }
+                    break;
+                default: attrib++;
+            }
+        }
+    }
+
+    crHashtableAdd(stub.pGLXPixmapsHash, (unsigned int) pixmap, pGlxPixmap);
     return (GLXPixmap) pixmap;
 }
@@ -1438 +1497 @@
 {
     XVisualInfo * pVisual;
-
-    pVisual =  glXGetVisualFromFBConfig(dpy, config);
+    const char * pExt;
+
+    pVisual =  VBOXGLXTAG(glXGetVisualFromFBConfig)(dpy, config);
     if (!pVisual)
     {
@@ -1455 +1515 @@
         case GLX_BIND_TO_TEXTURE_TARGETS_EXT:
             *value = GLX_TEXTURE_2D_BIT_EXT;
+            pExt = (const char *) stub.spu->dispatch_table.GetString(GL_EXTENSIONS);
+            if (crStrstr(pExt, "GL_NV_texture_rectangle")
+                || crStrstr(pExt, "GL_ARB_texture_rectangle")
+                || crStrstr(pExt, "GL_EXT_texture_rectangle"))
+            {
+                *value |= GLX_TEXTURE_RECTANGLE_BIT_EXT;
+            }
             break;
         case GLX_BIND_TO_TEXTURE_RGBA_EXT:
-            //crDebug("attribute=GLX_BIND_TO_TEXTURE_RGBA_EXT");
-            *value = True;
+            *value = pVisual->depth==32;
             break;
         case GLX_BIND_TO_TEXTURE_RGB_EXT:
@@ -1838 +1904 @@
 }
 
-static GLX_Pixmap_t* stubInitGlxPixmap(Display *dpy, GLXDrawable draw, ContextInfo *pContext)
+static GLX_Pixmap_t* stubInitGlxPixmap(GLX_Pixmap_t* pCreateInfoPixmap, Display *dpy, GLXDrawable draw, ContextInfo *pContext)
 {
     int x, y;
@@ -1847 +1913 @@
     GLX_Pixmap_t *pGlxPixmap;
 
-    CRASSERT(pContext);
+    CRASSERT(pContext && pCreateInfoPixmap);
 
     if (!XGetGeometry(dpy, (Pixmap)draw, &root, &x, &y, &w, &h, &border, &depth))
@@ -1873 +1939 @@
     pGlxPixmap->depth = depth;
     pGlxPixmap->root = root;
-    pGlxPixmap->format = pGlxPixmap->depth==24 ? GL_RGB : GL_RGBA;
+    pGlxPixmap->format = pCreateInfoPixmap->format;
+    pGlxPixmap->target = pCreateInfoPixmap->target;
 
     /* Try to allocate shared memory
@@ -1910 +1977 @@
         if (!pGlxPixmap->pDamageRegion)
         {
-            crWarning("stubInitGlxPixmap failed to create empy damage region for drawable 0x%x", (unsigned int) draw);
+            crWarning("stubInitGlxPixmap failed to create empty damage region for drawable 0x%x", (unsigned int) draw);
         }
 
@@ -1927 +1994 @@
     if (CR_MAX_TRANSFER_SIZE < 4*pGlxPixmap->w*pGlxPixmap->h)
     {
-        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0, 
+        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0, 
                                             GL_BGRA, GL_UNSIGNED_BYTE, NULL);
     }
 
     crHashtableAdd(pContext->pGLXPixmapsHash, (unsigned int) draw, pGlxPixmap);
+    crHashtableDelete(stub.pGLXPixmapsHash, (unsigned int) draw, crFree);
 
     return pGlxPixmap;
@@ -1972 +2040 @@
         /* Have to make sure XCopyArea is processed */
         XSync(dpy, False);
-        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0, 
+        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0, 
                                             GL_BGRA, GL_UNSIGNED_BYTE, stub.xshmSI.shmaddr);
         /*crDebug("Sync texture for drawable 0x%x(dmg handle 0x%x) [%i,%i,%i,%i]", 
@@ -2021 +2089 @@
             stub.spu->dispatch_table.PixelStorei(GL_UNPACK_ROW_LENGTH, pGlxPixmap->w);
         }
-        stub.spu->dispatch_table.TexSubImage2D(GL_TEXTURE_2D, 0, pRect->x, pRect->y, pRect->width, pRect->height, 
+        stub.spu->dispatch_table.TexSubImage2D(pGlxPixmap->target, 0, pRect->x, pRect->y, pRect->width, pRect->height, 
                                                GL_BGRA, GL_UNSIGNED_BYTE, stub.xshmSI.shmaddr);
         if (pRect->width!=pGlxPixmap->w)
@@ -2063 +2131 @@
     GLX_Pixmap_t *pGlxPixmap;
 
-    crDebug("->glXBindTexImageEXT");
-
     if (!stub.currentContext)
     {
@@ -2074 +2140 @@
     if (!pGlxPixmap)
     {
-        /*Not a fault, just setup the desired information, see comment for glXCreatePixmap function*/
-        pGlxPixmap = stubInitGlxPixmap(dpy, draw, stub.currentContext);
-
-        if (!pGlxPixmap) return;
+        pGlxPixmap = (GLX_Pixmap_t *) crHashtableSearch(stub.pGLXPixmapsHash, (unsigned int) draw);
+        if (!pGlxPixmap)
+        {
+            crDebug("Unknown drawable 0x%x in glXBindTexImageEXT!", (unsigned int) draw);
+            return;
+        }
+        pGlxPixmap = stubInitGlxPixmap(pGlxPixmap, dpy, draw, stub.currentContext);
+        if (!pGlxPixmap)
+        {
+            crDebug("glXBindTexImageEXT failed to get pGlxPixmap");
+            return;
+        }
     }
 
@@ -2131 +2205 @@
         }
 
-        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 0, pGlxPixmap->format, pxim->width, pxim->height, 0, 
+        stub.spu->dispatch_table.TexImage2D(pGlxPixmap->target, 0, pGlxPixmap->format, pxim->width, pxim->height, 0, 
                                             GL_BGRA, GL_UNSIGNED_BYTE, (void*)(&(pxim->data[0])));
         XDestroyImage(pxim);

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -257 +257 @@
         shmdt(stub.xshmSI.shmaddr);
     }
-#endif
+    crFreeHashtable(stub.pGLXPixmapsHash, crFree);
+#endif
+
+    crFreeHashtable(stub.windowTable, crFree);
+    crFreeHashtable(stub.contextTable, NULL);
 
     crMemset(&stub, 0, sizeof(stub) );
@@ -644 +648 @@
     stub.xshmSI.shmid = -1;
     stub.bShmInitFailed = GL_FALSE;
+    stub.pGLXPixmapsHash = crAllocHashtable();
 #endif
 

trunk/src/VBox/Additions/common/crOpenGL/stub.h

@@ -75 +75 @@
     GLenum format;
     Window root;
+    GLenum target;
     GC gc;
     Pixmap hShmPixmap; /* Shared memory pixmap object, if it's supported*/
@@ -207 +208 @@
     XShmSegmentInfo xshmSI;
     GLboolean       bShmInitFailed;
+
+    CRHashTable     *pGLXPixmapsHash;
 #endif