Changeset 52329 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Aug 8, 2014 6:34:02 PM (11 years ago)

Author:

vboxsync

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

95454

Message:

wddm/crOpenGL: prevent shared objects from being deleted till they can be used

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.c (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (1 diff)

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

@@ -11 +11 @@
 #include "cr_string.h"
 #include "cr_pixeldata.h"
+#ifdef VBOX_WITH_CRDUMPER
+# include "cr_dump.h"
+#endif
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchSelectBuffer( GLsizei size, GLuint *buffer )
@@ -311 +314 @@
     case GL_RCUSAGE_TEXTURE_CLEAR_CR:
         crStateSetTextureUsed(value, GL_FALSE);
+        break;
+    case GL_PIN_TEXTURE_SET_CR:
+        crStatePinTexture(value, GL_TRUE);
+        break;
+    case GL_PIN_TEXTURE_CLEAR_CR:
+        crStatePinTexture(value, GL_FALSE);
         break;
     case GL_SHARED_DISPLAY_LISTS_CR:
@@ -1486 +1495 @@
 #ifdef VBOX_WITH_CRSERVER_DUMPER
 
+# ifndef VBOX_WITH_CRDUMPER
+#  error "VBOX_WITH_CRDUMPER undefined!"
+# endif
+
 /* first four bits are buffer dump config
  * second four bits are texture dump config

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -1047 +1047 @@
     if (pTobj)
     {
-        CR_STATE_SHAREDOBJ_USAGE_CLEAR(pTobj, cr_server.MainContextInfo.pContext);
-
         crHashtableDelete(g_CrPresenter.pFbTexMap, pTobj->id, NULL);
 
-        if (!CR_STATE_SHAREDOBJ_USAGE_IS_USED(pTobj))
-        {
-            CRSharedState *pShared = crStateGlobalSharedAcquire();
-
-            CRASSERT(pShared);
-            /* on the host side, we need to delete an ogl texture object here as well, which crStateDeleteTextureCallback will do
-             * in addition to calling crStateDeleteTextureObject to delete a state object */
-            crHashtableDelete(pShared->textureTable, pTobj->id, crStateDeleteTextureCallback);
-
-            crStateGlobalSharedRelease();
-        }
+        crStateReleaseTexture(cr_server.MainContextInfo.pContext, pTobj);
+
 
         crStateGlobalSharedRelease();