Changeset 31808 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Aug 20, 2010 9:40:40 AM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: resource sharing between contexts

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• get_components.py (modified) (1 diff)
• server.h (modified) (1 diff)
• server_bufferobject.c (modified) (1 diff)
• server_framebuffer.c (modified) (2 diffs)
• server_gentextures.c (modified) (1 diff)
• server_get.py (modified) (2 diffs)
• server_glsl.c (modified) (1 diff)
• server_lists.c (modified) (5 diffs)
• server_main.c (modified) (3 diffs)
• server_misc.c (modified) (1 diff)
• server_muralfbo.c (modified) (2 diffs)
• server_simpleget.py (modified) (2 diffs)
• server_special (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/get_components.py

@@ -104 +104 @@
         'GL_BUFFER_ACCESS_ARB': (1, 'CR_ARB_vertex_buffer_object'),
         'GL_BUFFER_MAPPED_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING': (4, 'CR_ARB_vertex_buffer_object'),
+        'GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
         'GL_QUERY_COUNTER_BITS_ARB': (1, 'CR_ARB_occlusion_query'),
         'GL_QUERY_RESULT_AVAILABLE_ARB': (1, 'CR_ARB_occlusion_query'),

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -87 +87 @@
 GLint crServerSPUWindowID(GLint serverWindow);
 
-GLuint crServerTranslateTextureID(GLuint id);
 GLuint crServerTranslateProgramID(GLuint id);
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_bufferobject.c

@@ -59 +59 @@
         }
 }
+
+void SERVER_DISPATCH_APIENTRY
+crServerDispatchBindBufferARB(GLenum target, GLuint buffer)
+{
+    crStateBindBufferARB(target, buffer);
+    cr_server.head_spu->dispatch_table.BindBufferARB(target, crStateGetBufferHWID(buffer));
+}
+
+GLboolean SERVER_DISPATCH_APIENTRY
+crServerDispatchIsBufferARB(GLuint buffer)
+{
+    GLboolean retval;
+    retval = cr_server.head_spu->dispatch_table.IsBufferARB(crStateGetBufferHWID(buffer));
+    crServerReturnValue( &retval, sizeof(retval) );
+    return retval; /* WILL PROBABLY BE IGNORED */
+}

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c

@@ -46 +46 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchFramebufferTexture1DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    if (texture)
-    {
-        texture = crServerTranslateTextureID(texture);
-    }
-
     crStateFramebufferTexture1DEXT(target, attachment, textarget, texture, level);
-    cr_server.head_spu->dispatch_table.FramebufferTexture1DEXT(target, attachment, textarget, texture, level);
+    cr_server.head_spu->dispatch_table.FramebufferTexture1DEXT(target, attachment, textarget, crStateGetTextureHWID(texture), level);
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchFramebufferTexture2DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    if (texture)
-    {
-        texture = crServerTranslateTextureID(texture);
-    }
-
     crStateFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
-    cr_server.head_spu->dispatch_table.FramebufferTexture2DEXT(target, attachment, textarget, texture, level);
+    cr_server.head_spu->dispatch_table.FramebufferTexture2DEXT(target, attachment, textarget, crStateGetTextureHWID(texture), level);
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchFramebufferTexture3DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    if (texture)
-    {
-        texture = crServerTranslateTextureID(texture);
-    }
-
     crStateFramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset);
-    cr_server.head_spu->dispatch_table.FramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset);
+    cr_server.head_spu->dispatch_table.FramebufferTexture3DEXT(target, attachment, textarget, crStateGetTextureHWID(texture), level, zoffset);
 }
 
@@ -121 +106 @@
         crStateGetFramebufferAttachmentParameterivEXT(target, attachment, pname, local_params);
 
-    if (GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT==pname)
-    {
-        GLint type;
-        crStateGetFramebufferAttachmentParameterivEXT(target, attachment, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT, &type);
-        if (GL_TEXTURE==type)
-        {
-            /*todo, add reverse of crServerTranslateTextureID*/
-            if (!cr_server.sharedTextureObjects && local_params[0])
-            {
-                int client = cr_server.curClient->number;
-                local_params[0] = local_params[0] - client * 100000;
-            }
-        }
-    }
-
         crServerReturnValue(&(local_params[0]), 1*sizeof(GLint));
 }
+
+GLboolean SERVER_DISPATCH_APIENTRY crServerDispatchIsFramebufferEXT( GLuint framebuffer )
+{
+    GLboolean retval;
+    retval = cr_server.head_spu->dispatch_table.IsFramebufferEXT(crStateGetFramebufferHWID(framebuffer));
+    crServerReturnValue( &retval, sizeof(retval) );
+    return retval; /* WILL PROBABLY BE IGNORED */
+}
+
+GLboolean SERVER_DISPATCH_APIENTRY crServerDispatchIsRenderbufferEXT( GLuint renderbuffer )
+{
+    GLboolean retval;
+    retval = cr_server.head_spu->dispatch_table.IsRenderbufferEXT(crStateGetRenderbufferHWID(renderbuffer));
+    crServerReturnValue( &retval, sizeof(retval) );
+    return retval; /* WILL PROBABLY BE IGNORED */
+}

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_gentextures.c

@@ -14 +14 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGenTextures( GLsizei n, GLuint *textures )
 {
-    GLsizei i;
-    GLuint *local_textures = (GLuint *) crAlloc( n*sizeof( *local_textures) );
+    GLuint *local_textures = (GLuint *) crAlloc(n*sizeof(*local_textures));
     (void) textures;
-    cr_server.head_spu->dispatch_table.GenTextures( n, local_textures );
 
-    /* This is somewhat hacky.
-     * We have to make sure we're going to generate unique texture IDs.
-     * That wasn't the case before snapshot loading, because we could just rely on host video drivers.
-     * Now we could have a set of loaded texture IDs which aren't already reserved in the host driver.
-     * Note: It seems, that it's easy to reserve ATI/NVidia IDs, by simply calling glGenTextures
-     * with n==number of loaded textures. But it's really implementation dependant. So can't rely that it'll not change.
-     */
-    for (i=0; i<n; ++i)
-    {
-        /* translate the ID as it'd be done in glBindTexture call */
-        GLuint tID = crServerTranslateTextureID(local_textures[i]);
-        /* check if we have a texture with same ID loaded from snapshot */
-        while (crStateIsTexture(tID))
-        {
-            /* request new ID */
-            cr_server.head_spu->dispatch_table.GenTextures(1, &tID);
-            local_textures[i] = tID;
-            tID = crServerTranslateTextureID(tID);
-        }
-    }
+    crStateGenTextures(n, local_textures);
 
-    crServerReturnValue( local_textures, n*sizeof( *local_textures ) );
+    crServerReturnValue(local_textures, n*sizeof(*local_textures));
     crFree( local_textures );
 }
-
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchGenProgramsNV( GLsizei n, GLuint * ids )

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_get.py

@@ -100 +100 @@
 ];
 
+convert_bufferid = [
+    'GetVertexAttribdvARB',
+    'GetVertexAttribdvNV',
+    'GetVertexAttribfvARB',
+    'GetVertexAttribfvNV',
+    'GetVertexAttribivARB',
+    'GetVertexAttribivNV'
+];
+
 from get_components import *;
 
@@ -125 +134 @@
 
         print '\tcr_server.head_spu->dispatch_table.%s( %s );' % ( func_name, apiutil.MakeCallString(params) )
+
+        if func_name in convert_bufferid:
+            print '\tif (pname==GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB){'
+            print '\t\tlocal_params[0]=(%s)crStateBufferHWIDtoID((GLint)local_params[0]);' % (local_argtype);
+            print '\t}'
+
         if func_name in no_pnames:
             print '\tcrServerReturnValue( &(%s[0]), %d*sizeof(%s) );' % (local_argname, max_components[func_name], local_argtype );

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c

@@ -104 +104 @@
 }
 
+GLint SERVER_DISPATCH_APIENTRY crServerDispatchGetAttribLocation( GLuint program, const char * name )
+{
+    GLint retval;
+    retval = cr_server.head_spu->dispatch_table.GetAttribLocation(crStateGetProgramHWID(program), name );
+    crServerReturnValue( &retval, sizeof(retval) );
+    return retval; /* WILL PROBABLY BE IGNORED */
+}
+
+GLhandleARB SERVER_DISPATCH_APIENTRY crServerDispatchGetHandleARB( GLenum pname )
+{
+    GLhandleARB retval;
+    retval = cr_server.head_spu->dispatch_table.GetHandleARB(pname);
+    if (pname==GL_PROGRAM_OBJECT_ARB)
+    {
+        retval = crStateGLSLProgramHWIDtoID(retval);
+    }
+    crServerReturnValue( &retval, sizeof(retval) );
+    return retval; /* WILL PROBABLY BE IGNORED */
+}
+
+GLint SERVER_DISPATCH_APIENTRY crServerDispatchGetUniformLocation(GLuint program, const char * name)
+{
+    GLint retval;
+    retval = cr_server.head_spu->dispatch_table.GetUniformLocation(crStateGetProgramHWID(program), name);
+    crServerReturnValue( &retval, sizeof(retval) );
+    return retval; /* WILL PROBABLY BE IGNORED */
+}
+
 #endif /* #ifdef CR_OPENGL_VERSION_2_0 */

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_lists.c

@@ -41 +41 @@
 {
     if (!cr_server.sharedDisplayLists) {
-        int client = cr_server.curClient->number;
-        return id + client * 100000;
-    }
-    return id;
-}
-
-
-GLuint crServerTranslateTextureID( GLuint id )
-{
-    if (!cr_server.sharedTextureObjects && id) {
         int client = cr_server.curClient->number;
         return id + client * 100000;
@@ -248 +238 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchBindTexture( GLenum target, GLuint texture )
 {
-    texture = crServerTranslateTextureID( texture );
     crStateBindTexture( target, texture );
-    cr_server.head_spu->dispatch_table.BindTexture( target, texture );
-}
-
+    cr_server.head_spu->dispatch_table.BindTexture(target, crStateGetTextureHWID(texture));
+}
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteTextures( GLsizei n, const GLuint *textures)
 {
-    if (!cr_server.sharedTextureObjects) {
-        GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
-        GLint i;
-        if (!newTextures) {
-            crError("crServerDispatchDeleteTextures: out of memory");
-            return;
-        }
-        for (i = 0; i < n; i++) {
-            newTextures[i] = crServerTranslateTextureID( textures[i] );
-        }
-        crStateDeleteTextures( n, newTextures );
-        cr_server.head_spu->dispatch_table.DeleteTextures( n, newTextures );
-        crFree(newTextures);
-    }
-    else {
-        crStateDeleteTextures( n, textures );
-        cr_server.head_spu->dispatch_table.DeleteTextures( n, textures );
-    }
+    GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
+    GLint i;
+
+    if (!newTextures)
+    {
+        crError("crServerDispatchDeleteTextures: out of memory");
+        return;
+    }
+
+    for (i = 0; i < n; i++)
+    {
+        newTextures[i] = crStateGetTextureHWID(textures[i]);
+    }
+
+    crStateDeleteTextures(n, textures);
+    cr_server.head_spu->dispatch_table.DeleteTextures(n, newTextures);
+    crFree(newTextures);
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchPrioritizeTextures( GLsizei n, const GLuint * textures, const GLclampf * priorities )
 {
-    if (!cr_server.sharedTextureObjects) 
+    GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
+    GLint i;
+
+    if (!newTextures)
     {
-        GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
-        GLint i;
-        if (!newTextures) {
-            crError("crServerDispatchDeleteTextures: out of memory");
-            return;
-        }
-        for (i = 0; i < n; i++) {
-            newTextures[i] = crServerTranslateTextureID( textures[i] );
-        }
-        crStatePrioritizeTextures(n, newTextures, priorities);
-        cr_server.head_spu->dispatch_table.PrioritizeTextures(n, newTextures, priorities);
-        crFree(newTextures);
-    }
-    else
+        crError("crServerDispatchDeleteTextures: out of memory");
+        return;
+    }
+
+    for (i = 0; i < n; i++)
     {
-        crStatePrioritizeTextures(n, textures, priorities);
-        cr_server.head_spu->dispatch_table.PrioritizeTextures(n, textures, priorities);
-    }
+        newTextures[i] = crStateGetTextureHWID(textures[i]);
+    }
+
+    crStatePrioritizeTextures(n, textures, priorities);
+    cr_server.head_spu->dispatch_table.PrioritizeTextures(n, newTextures, priorities);
+    crFree(newTextures);
 }
 
@@ -320 +304 @@
 {
     GLboolean retval;
-    texture = crServerTranslateTextureID( texture );
-    retval = cr_server.head_spu->dispatch_table.IsTexture( texture );
+    retval = cr_server.head_spu->dispatch_table.IsTexture(crStateGetTextureHWID(texture));
     crServerReturnValue( &retval, sizeof(retval) );
     return retval; /* WILL PROBABLY BE IGNORED */
@@ -330 +313 @@
 {
     GLboolean retval;
-    program = crServerTranslateTextureID(program);
+    program = crServerTranslateProgramID(program);
     retval = cr_server.head_spu->dispatch_table.IsProgramARB( program );
     crServerReturnValue( &retval, sizeof(retval) );
@@ -349 +332 @@
         GLuint *textures2 = (GLuint *) crAlloc(n * sizeof(GLuint));
         for (i = 0; i < n; i++)
-            textures2[i] = crServerTranslateTextureID(textures[i]);
+            textures2[i] = crStateGetTextureHWID(textures[i]);
         retval = cr_server.head_spu->dispatch_table.AreTexturesResident(n, textures2, res);
         crFree(textures2);
-    }
-    else {
-        retval = cr_server.head_spu->dispatch_table.AreTexturesResident(n, textures, res);
     }
     crServerReturnValue(res, n * sizeof(GLboolean));

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -793 +793 @@
         char psz[200];
         GLint ctxID;
+        CRContext* pContext;
 
         rc = SSMR3GetMem(pSSM, &key, sizeof(key));
@@ -808 +809 @@
         ctxID = crServerDispatchCreateContextEx(createInfo.pszDpyName, createInfo.visualBits, 0, key, createInfo.internalID);
         CRASSERT((int64_t)ctxID == (int64_t)key);
+
+        pContext = (CRContext*) crHashtableSearch(cr_server.contextTable, key);
+        CRASSERT(pContext);
+        pContext->shared->id=-1;
     }
 
@@ -821 +826 @@
         CRASSERT(pContext);
 
-        rc = crStateLoadContext(pContext, pSSM);
+        rc = crStateLoadContext(pContext, cr_server.contextTable, pSSM);
         AssertRCReturn(rc, rc);
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.c

@@ -216 +216 @@
 {
   switch (target) {
+    case GL_SHARE_CONTEXT_RESOURCES_CR:
+        crStateShareContext(value);
+        break;
     case GL_SHARED_DISPLAY_LISTS_CR:
         cr_server.sharedDisplayLists = value;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

@@ -229 +229 @@
 
     /*Restore gl state*/
-    uid = ctx->texture.unit[ctx->texture.curTextureUnit].currentTexture2D->name;
+    uid = ctx->texture.unit[ctx->texture.curTextureUnit].currentTexture2D->hwid;
     cr_server.head_spu->dispatch_table.BindTexture(GL_TEXTURE_2D, uid);
 
@@ -330 +330 @@
     cr_server.head_spu->dispatch_table.BindTexture(GL_TEXTURE_2D, mural->idColorTex);
     cr_server.head_spu->dispatch_table.GetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_BYTE, pixels);
-    uid = ctx->texture.unit[ctx->texture.curTextureUnit].currentTexture2D->name;
+    uid = ctx->texture.unit[ctx->texture.curTextureUnit].currentTexture2D->hwid;
     cr_server.head_spu->dispatch_table.BindTexture(GL_TEXTURE_2D, uid);
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_simpleget.py

@@ -61 +61 @@
         CRASSERT(tablesize/sizeof(%s)==1);
         texid = (GLuint) *get_values;
-        if (texid)
-        {
-            *get_values = (%s) (texid - cr_server.curClient->number * 100000);
-        }
+        *get_values = (%s) crStateTextureHWIDtoID(texid);
     }
     else if (GL_CURRENT_PROGRAM==pname)
@@ -93 +90 @@
         *get_values = (%s) crStateRBOHWIDtoID(rbid);
     }
-    """ % (types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index])
+    else if (GL_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_VERTEX_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_NORMAL_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_COLOR_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_INDEX_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB==pname
+             || GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB==pname)
+    {
+        GLuint bufid;
+        CRASSERT(tablesize/sizeof(%s)==1);
+        bufid = (GLuint) *get_values;
+        *get_values = (%s) crStateBufferHWIDtoID(bufid);
+    }
+    """ % (types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index])
     print '\tcrServerReturnValue( get_values, tablesize );'
     print '\tcrFree(get_values);'

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_special

@@ -235 +235 @@
 TexImage2D
 TexImage3D
+BindBufferARB
+IsBufferARB
+IsFramebufferEXT
+IsRenderbufferEXT
+GetAttribLocation
+GetHandleARB
+GetUniformLocation