Changeset 34107 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Nov 16, 2010 11:37:51 AM (14 years ago)

Author:

vboxsync

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

67809

Message:

crOpenGL/wddm: resync shared data only once

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_glstate.h (modified) (1 diff)
• include/state/cr_bufferobject.h (modified) (1 diff)
• include/state/cr_framebuffer.h (modified) (1 diff)
• include/state/cr_texture.h (modified) (1 diff)
• state_tracker/state_bufferobject.c (modified) (3 diffs)
• state_tracker/state_framebuffer.c (modified) (2 diffs)
• state_tracker/state_snapshot.c (modified) (4 diffs)
• state_tracker/state_texdiff.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_glstate.h

@@ -105 +105 @@
     GLint id;                   /*unique shared state id, it's not always matching some existing context id!*/
     GLint saveCount;
+
+    /* Indicates that we have to resend data to GPU on first glMakeCurrent call with owning context */
+    GLboolean   bTexResyncNeeded;
+    GLboolean   bVBOResyncNeeded;
+    GLboolean   bFBOResyncNeeded;
 } CRSharedState;
 

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_bufferobject.h

@@ -52 +52 @@
 
         CRBufferObject *nullBuffer;  /* name = 0 */
-
-    GLboolean   bResyncNeeded;
 } CRBufferObjectState;
 

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h

@@ -62 +62 @@
     CRFramebufferObject     *readFB, *drawFB;
     CRRenderbufferObject    *renderbuffer;
-
-    /* Indicates that we have to resend FBO data to GPU on first glMakeCurrent call with owning context */
-    GLboolean   bResyncNeeded;
 } CRFramebufferObjectState;
 

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_texture.h

@@ -203 +203 @@
     GLboolean   broadcastTextures; /*@todo what is it for?*/
 
-    /* Indicates that we have to resend texture data to GPU on first glMakeCurrent call with owning context */
-    GLboolean   bResyncNeeded;
-
     /* Per-texture unit state: */
     CRTextureUnit   unit[CR_MAX_TEXTURE_UNITS];

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bufferobject.c

@@ -98 +98 @@
 #endif
 
-    b->bResyncNeeded = GL_FALSE;
+    ctx->shared->bVBOResyncNeeded = GL_FALSE;
 }
 
@@ -988 +988 @@
         return;
 
-    if (to->bResyncNeeded)
+    if (toCtx->shared->bVBOResyncNeeded)
     {
         CRClientPointer *cp;
@@ -994 +994 @@
 
         crHashtableWalk(toCtx->shared->buffersTable, crStateBufferObjectSyncCB, to);
-        to->bResyncNeeded = GL_FALSE;
+        toCtx->shared->bVBOResyncNeeded = GL_FALSE;
 
         /*@todo, move to state_client.c*/

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c

@@ -37 +37 @@
     fbo->drawFB = NULL;
     fbo->renderbuffer = NULL;
-    fbo->bResyncNeeded = GL_FALSE;
+    ctx->shared->bFBOResyncNeeded = GL_FALSE;
 }
 
@@ -693 +693 @@
 crStateFramebufferObjectSwitch(CRContext *from, CRContext *to)
 {
-    if (to->framebufferobject.bResyncNeeded)
-    {
-        to->framebufferobject.bResyncNeeded = GL_FALSE;
+    if (to->shared->bFBOResyncNeeded)
+    {
+        to->shared->bFBOResyncNeeded = GL_FALSE;
 
         crHashtableWalk(to->shared->rbTable, crStateSyncRenderbuffersCB, NULL);

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

@@ -89 +89 @@
              * For ex. we're saving snapshot right after it was loaded
              * and some context hasn't been used by the guest application yet
-             * (pContext->texture.bResyncNeeded==GL_TRUE).
+             * (pContext->shared->bTexResyncNeeded==GL_TRUE).
              */
             else if (ptl->bytes)
@@ -1630 +1630 @@
 
     /* Mark textures for resending to GPU */
-    pContext->texture.bResyncNeeded = GL_TRUE;
+    pContext->shared->bTexResyncNeeded = GL_TRUE;
 
     /* Load lights */
@@ -1778 +1778 @@
     }
 
-    pContext->bufferobject.bResyncNeeded = GL_TRUE;
+    pContext->shared->bVBOResyncNeeded = GL_TRUE;
 #endif
 
@@ -1867 +1867 @@
 
     /* Mark FBOs/RBOs for resending to GPU */
-    pContext->framebufferobject.bResyncNeeded = GL_TRUE;
+    pContext->shared->bFBOResyncNeeded = GL_TRUE;
 #endif
 

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texdiff.c

@@ -501 +501 @@
 
     /* Resend texture images */
-    if (toCtx->texture.bResyncNeeded)
+    if (toCtx->shared->bTexResyncNeeded)
     {
-        toCtx->texture.bResyncNeeded = GL_FALSE;
+        toCtx->shared->bTexResyncNeeded = GL_FALSE;
 
         crStateDiffAllTextureObjects(toCtx, bitID, GL_TRUE);