Changeset 27091 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 5, 2010 2:13:31 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: add GL_ARB_pixel_buffer_object support

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu_bufferobject.c (modified) (5 diffs)
• packspu_misc.c (modified) (1 diff)
• packspu_pixel.c (modified) (4 diffs)
• packspu_special (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_bufferobject.c

@@ -11 +11 @@
 #include "packspu_proto.h"
 
+static void packspu_GetHostBufferSubDataARB( GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+
+    crPackGetBufferSubDataARB(target, offset, size, data, &writeback);
+
+    packspuFlush((void *) thread);
+
+    while (writeback)
+        crNetRecv();
+}
 
 void * PACKSPU_APIENTRY
@@ -17 +29 @@
     GET_CONTEXT(ctx);
     void *buffer;
-#if 0
-    CRBufferObject *bufObj;
-    GLint size = -1;
+    CRBufferObject *pBufObj;
 
-    (void) crStateMapBufferARB( target, access );
+    CRASSERT(GL_TRUE == ctx->clientState->bufferobject.retainBufferData);
+    buffer = crStateMapBufferARB(target, access);
 
-    crStateGetBufferParameterivARB(target, GL_BUFFER_SIZE_ARB, &size);
-    if (size <= 0)
-        return NULL;
+#ifdef CR_ARB_pixel_buffer_object
+    if (buffer)
+    {
+        pBufObj = crStateGetBoundBufferObject(target, &ctx->clientState->bufferobject);
+        CRASSERT(pBufObj);
 
-    if (crStateGetError()) {
-        /* something may have gone wrong already */
-        return NULL;
+        if (pBufObj->bResyncOnRead && 
+            access != GL_WRITE_ONLY_ARB)
+        {
+            /*fetch data from host side*/
+            packspu_GetHostBufferSubDataARB(target, 0, pBufObj->size, buffer);
+        }
     }
-
-    /* allocate buffer space */
-    buffer = crAlloc(size);
-    if (!buffer) {
-        return NULL;
-    }
-
-    /* update state tracker info */
-    if (target == GL_ARRAY_BUFFER_ARB) {
-        bufObj = ctx->clientState->bufferobject.arrayBuffer;
-    }
-    else {
-        CRASSERT(target == GL_ELEMENT_ARRAY_BUFFER_ARB);
-        bufObj = ctx->clientState->bufferobject.elementsBuffer;
-    }
-    bufObj->pointer = buffer;
-
-    /* Get current buffer data from server.
-     * Ideally, if we could detect that the entire buffer was being
-     * rewritten, we wouldn't have to fetch the current data here.
-     */
-    packspu_GetBufferSubDataARB(target, 0, bufObj->size, buffer);
-#else
-    CRASSERT(GL_TRUE == ctx->clientState->bufferobject.retainBufferData);
-    buffer = crStateMapBufferARB(target, access); 
 #endif
 
@@ -63 +54 @@
 void PACKSPU_APIENTRY packspu_GetBufferSubDataARB( GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data )
 {
+    GET_CONTEXT(ctx);
+
+#ifdef CR_ARB_pixel_buffer_object
+    CRBufferObject *pBufObj;
+
+    pBufObj = crStateGetBoundBufferObject(target, &ctx->clientState->bufferobject);
+
+    if (pBufObj && pBufObj->bResyncOnRead)
+    {
+        packspu_GetHostBufferSubDataARB(target, offset, size, data);
+        return;
+    }
+#endif
+    
     crStateGetBufferSubDataARB(target, offset, size, data);
 }
@@ -75 +80 @@
     CRBufferObject *bufObj;
 
-    if (target == GL_ARRAY_BUFFER_ARB) {
-        bufObj = ctx->clientState->bufferobject.arrayBuffer;
-    }
-    else {
-        CRASSERT(target == GL_ELEMENT_ARRAY_BUFFER_ARB);
-        bufObj = ctx->clientState->bufferobject.elementsBuffer;
-    }
+    bufObj = crStateGetBoundBufferObject(target, &ctx->clientState->bufferobject);
 
     /* send new buffer contents to server */
@@ -124 +123 @@
 }
 
-
 /*
  * Need to update our local state for vertex arrays.

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -240 +240 @@
     return return_val;
 }
+
+void PACKSPU_APIENTRY packspu_GetPolygonStipple( GLubyte * mask )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+
+    if (pack_spu.swap)
+    {
+        crPackGetPolygonStippleSWAP( mask, &writeback );
+    }
+    else
+    {
+        crPackGetPolygonStipple( mask, &writeback );
+    }
+
+#ifdef CR_ARB_pixel_buffer_object
+    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+#endif
+    {
+        packspuFlush( (void *) thread );
+        while (writeback)
+            crNetRecv();
+    }
+}
+
+void PACKSPU_APIENTRY packspu_GetPixelMapfv( GLenum map, GLfloat * values )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+
+    if (pack_spu.swap)
+    {
+        crPackGetPixelMapfvSWAP( map, values, &writeback );
+    }
+    else
+    {
+        crPackGetPixelMapfv( map, values, &writeback );
+    }
+
+#ifdef CR_ARB_pixel_buffer_object
+    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+#endif
+    {
+        packspuFlush( (void *) thread );
+        while (writeback)
+            crNetRecv();
+    }
+}
+
+void PACKSPU_APIENTRY packspu_GetPixelMapuiv( GLenum map, GLuint * values )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+
+    if (pack_spu.swap)
+    {
+        crPackGetPixelMapuivSWAP( map, values, &writeback );
+    }
+    else
+    {
+        crPackGetPixelMapuiv( map, values, &writeback );
+    }
+
+#ifdef CR_ARB_pixel_buffer_object
+    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+#endif
+    {
+        packspuFlush( (void *) thread );
+        while (writeback)
+            crNetRecv();
+    }
+}
+
+void PACKSPU_APIENTRY packspu_GetPixelMapusv( GLenum map, GLushort * values )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+
+    if (pack_spu.swap)
+    {
+        crPackGetPixelMapusvSWAP( map, values, &writeback );
+    }
+    else
+    {
+        crPackGetPixelMapusv( map, values, &writeback );
+    }
+
+#ifdef CR_ARB_pixel_buffer_object
+    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+#endif
+    {
+        packspuFlush( (void *) thread );
+        while (writeback)
+            crNetRecv();
+    }
+}

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_pixel.c

@@ -184 +184 @@
     ContextInfo *ctx = thread->currentContext;
     CRClientState *clientState = &(ctx->clientState->client);
-    int writeback;
-    pack_spu.ReadPixels++;
-    if (pack_spu.swap)
-        crPackReadPixelsSWAP( x, y, width, height, format, type, pixels,
-                            &(clientState->pack), &writeback );
-    else
-        crPackReadPixels( x, y, width, height, format, type, pixels,
-                            &(clientState->pack), &writeback );
-    packspuFlush( (void *) thread );
-    while (pack_spu.ReadPixels) 
-        crNetRecv();
+    int writeback;    
+
+    if (pack_spu.swap)
+    {
+        crPackReadPixelsSWAP(x, y, width, height, format, type, pixels,
+                             &(clientState->pack), &writeback);
+    }
+    else
+    {
+        crPackReadPixels(x, y, width, height, format, type, pixels,
+                         &(clientState->pack), &writeback);
+    }
+
+#ifdef CR_ARB_pixel_buffer_object
+    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+#endif
+    {
+        pack_spu.ReadPixels++;
+
+        packspuFlush((void *) thread);
+        while (pack_spu.ReadPixels) 
+            crNetRecv();
+    }
 }
 
@@ -225 +237 @@
     if (!packspu_CheckTexImageParams(internalformat, format, type))
     {
-        if (pixels)
+        if (pixels || crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
         {
             crWarning("packspu_TexImage1D invalid internalFormat(%x)/format(%x)/type(%x)", internalformat, format, type);
@@ -248 +260 @@
     if (!packspu_CheckTexImageParams(internalformat, format, type))
     {
-        if (pixels)
+        if (pixels || crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
         {
             crWarning("packspu_TexImage2D invalid internalFormat(%x)/format(%x)/type(%x)", internalformat, format, type);
@@ -359 +371 @@
     else
         crPackGetTexImage( target, level, format, type, pixels, &(clientState->pack), &writeback );
-    packspuFlush( (void *) thread );
-    while (writeback) 
-        crNetRecv();
-}
+
+#ifdef CR_ARB_pixel_buffer_object
+    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+#endif
+    {
+        packspuFlush( (void *) thread );
+        while (writeback) 
+            crNetRecv();
+    }
+}
+
+void PACKSPU_APIENTRY packspu_GetCompressedTexImageARB( GLenum target, GLint level, GLvoid * img )
+{
+    GET_THREAD(thread);
+    int writeback = 1;
+
+    if (pack_spu.swap)
+    {
+        crPackGetCompressedTexImageARBSWAP( target, level, img, &writeback );
+    }
+    else
+    {
+        crPackGetCompressedTexImageARB( target, level, img, &writeback );
+    }
+
+#ifdef CR_ARB_pixel_buffer_object
+    if (!crStateIsBufferBound(GL_PIXEL_PACK_BUFFER_ARB))
+#endif
+    {
+        packspuFlush( (void *) thread );
+        while (writeback)
+            crNetRecv();
+    }
+}

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_special

@@ -96 +96 @@
 BindTexture
 DeleteTextures
+GetPolygonStipple
+GetPixelMapfv
+GetPixelMapuiv
+GetPixelMapusv
+GetCompressedTexImageARB