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

Timestamp:

Nov 20, 2009 9:59:01 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: integrate fix for non ARGB textures and compiz

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• glx.c (modified) (4 diffs)
• stub.h (modified) (1 diff)

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

@@ -1869 +1869 @@
     pGlxPixmap->depth = depth;
     pGlxPixmap->root = root;
+    pGlxPixmap->format = pGlxPixmap->depth==24 ? GL_RGB : GL_RGBA;
 
     /* Try to allocate shared memory
@@ -1922 +1923 @@
     if (CR_MAX_TRANSFER_SIZE < 4*pGlxPixmap->w*pGlxPixmap->h)
     {
-        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pGlxPixmap->w, pGlxPixmap->h, 0, 
+        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 0, pGlxPixmap->format, pGlxPixmap->w, pGlxPixmap->h, 0, 
                                             GL_BGRA, GL_UNSIGNED_BYTE, NULL);
     }
@@ -1967 +1968 @@
         /* Have to make sure XCopyArea is processed */
         XSync(dpy, False);
-        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pGlxPixmap->w, pGlxPixmap->h, 0, 
+        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 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]", 
@@ -2126 +2127 @@
         }
 
-        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pxim->width, pxim->height, 0, 
+        stub.spu->dispatch_table.TexImage2D(GL_TEXTURE_2D, 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/stub.h

@@ -73 +73 @@
     int x, y;
     unsigned int w, h, border, depth;
+    GLenum format;
     Window root;
     GC gc;