Changeset 16640 in vbox for trunk/src/VBox

Timestamp:

Feb 10, 2009 3:37:23 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42620

Message:

crOpenGL: use shared memory to access xserver pixmaps data

Location:

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL

Files:

• context.c (modified) (2 diffs)
• load.c (modified) (2 diffs)
• pack/packspu_config.c (modified) (1 diff)
• stub.h (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/context.c

@@ -275 +275 @@
 #endif
 
+#ifdef GLX
+    context->pGLXPixmapsHash = crAllocHashtable();
+#endif
+
     crHashtableAdd(stub.contextTable, context->id, (void *) context);
 
@@ -1002 +1006 @@
     }
 
+#ifdef GLX
+    crFreeHashtable(context->pGLXPixmapsHash, crFree);
+#endif
+
     crMemZero(context, sizeof(ContextInfo));  /* just to be safe */
     crHashtableDelete(stub.contextTable, contextId, crFree);

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/load.c

@@ -207 +207 @@
 
     crNetTearDown();
+
+#ifdef GLX
+    if (stub.xshmSI.shmid>=0)
+    {
+        shmctl(stub.xshmSI.shmid, IPC_RMID, 0);
+        shmdt(stub.xshmSI.shmaddr);
+    }
+#endif
 
     crMemset(&stub, 0, sizeof(stub) );
@@ -541 +549 @@
 #endif
 
+#ifdef GLX
+    stub.xshmSI.shmid = -1;
+    stub.bShmInitFailed = GL_FALSE;
+#endif
+
     return true;
 }

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/pack/packspu_config.c

@@ -54 +54 @@
     pack_spu.swapbuffer_sync = 0;
     pack_spu.name = crStrdup("vboxhgcm://llp:7000");
-    pack_spu.buffer_size = 1024 * 1024;
+    pack_spu.buffer_size = 5 * 1024 * 1024;
 }

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/stub.h

@@ -39 +39 @@
 #include "cr_threads.h"
 #include "spu_dispatch_table.h"
+
+#ifdef GLX
+#include <X11/extensions/XShm.h>
+#include <sys/shm.h>
+#endif
 
 
@@ -60 +65 @@
 typedef struct window_info_t WindowInfo;
 
+#ifdef GLX
+typedef struct glxpixmap_info_t GLX_Pixmap_t;
+
+struct glxpixmap_info_t
+{
+    int x, y;
+    unsigned int w, h, border, depth;
+    Window root;
+    GC gc;
+    Pixmap pixmap;
+    void *data;
+};
+#endif
+
 struct context_info_t
 {
@@ -91 +110 @@
     Bool direct;
     GLXContext glxContext;
+    CRHashTable *pGLXPixmapsHash;
 #endif
 };
@@ -175 +195 @@
     CRHashTable *windowTable;
 
+#ifdef GLX
+    /* Shared memory, used to transfer XServer pixmaps data into client memory */
+    XShmSegmentInfo xshmSI;
+    GLboolean       bShmInitFailed;
+#endif
+
 #ifdef WINDOWS
     HHOOK       hMessageHook;