Changeset 50100 in vbox

Timestamp:

Jan 17, 2014 6:32:44 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: bugfixes

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_version.h (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (6 diffs)
• GuestHost/OpenGL/util/hash.c (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (2 diffs)

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

@@ -40 +40 @@
 #define SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS                     41
 #define SHCROGL_SSM_VERSION_WITH_FB_INFO                            42
-#define SHCROGL_SSM_VERSION                                         42
+#define SHCROGL_SSM_VERSION_WITH_BUGGY_KEYS                         42
+#define SHCROGL_SSM_VERSION                                         43
 
 /* These define the Chromium release number.

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

@@ -1427 +1427 @@
 }
 
-static int32_t crStateLoadKeys(CRHashTable *pHash, PSSMHANDLE pSSM)
+static int32_t crStateLoadKeys(CRHashTable *pHash, PSSMHANDLE pSSM, uint32_t u32Version)
 {
     uint32_t u32Key, u32Count, i;
@@ -1444 +1444 @@
         CRASSERT(u32Count);
 
-        for (i = u32Key; i < u32Count + u32Key; ++i)
-        {
-            GLboolean fIsNew = crHashtableAllocRegisterKey(pHash, i);
-            CRASSERT(fIsNew);
+        if (u32Version > SHCROGL_SSM_VERSION_WITH_BUGGY_KEYS)
+        {
+            for (i = u32Key; i < u32Count + u32Key; ++i)
+            {
+                GLboolean fIsNew = crHashtableAllocRegisterKey(pHash, i);
+                CRASSERT(fIsNew);
+            }
         }
     }
@@ -2232 +2235 @@
         if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
         {
-            rc = crStateLoadKeys(pContext->shared->buffersTable, pSSM);
+            rc = crStateLoadKeys(pContext->shared->buffersTable, pSSM, u32Version);
             AssertRCReturn(rc, rc);
         }
@@ -2342 +2345 @@
         if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
         {
-            rc = crStateLoadKeys(pContext->shared->textureTable, pSSM);
+            rc = crStateLoadKeys(pContext->shared->textureTable, pSSM, u32Version);
             AssertRCReturn(rc, rc);
         }
@@ -2471 +2474 @@
         if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
         {
-            rc = crStateLoadKeys(pContext->shared->fbTable, pSSM);
+            rc = crStateLoadKeys(pContext->shared->fbTable, pSSM, u32Version);
             AssertRCReturn(rc, rc);
         }
@@ -2496 +2499 @@
         if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
         {
-            rc = crStateLoadKeys(pContext->shared->rbTable, pSSM);
+            rc = crStateLoadKeys(pContext->shared->rbTable, pSSM, u32Version);
             AssertRCReturn(rc, rc);
         }

trunk/src/VBox/GuestHost/OpenGL/util/hash.c

@@ -218 +218 @@
 
         if (f->min > first)
-            f->min = first; /* first is guarantied not to touch any prev regions */
+            f->min = first; /* first is guaranteed not to touch any prev regions */
 
         newMax = last;
@@ -353 +353 @@
         if (prev)
         {
-            Assert(prev->max < (f->min - 1));
-            walkFunc(prev->max+1, f->min - 1, data);
+            Assert(prev->max < f->min);
+            walkFunc(prev->max+1, f->min - prev->max, data);
+        }
+        else if (f->min > pool->min)
+        {
+            walkFunc(pool->min, f->min - pool->min, data);
         }
 
@@ -364 +368 @@
     if (prev->max < pool->max)
     {
-        walkFunc(prev->max+1, pool->max, data);
+        walkFunc(prev->max+1, pool->max - prev->max, data);
     }
 }

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

@@ -1805 +1805 @@
     }
 
+    virtual int EntryTexChanged(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
+    {
+        int rc = CrFbDisplayBase::EntryTexChanged(pFb, hEntry);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+
+        if (mpWindow->GetParentId())
+        {
+            rc = mpWindow->Create();
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+                return rc;
+            }
+        }
+
+        return VINF_SUCCESS;
+    }
+
     virtual int EntryRemoved(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
     {
@@ -2833 +2855 @@
 {
     HCR_FRAMEBUFFER hFb = crPMgrFbGetNextEnabled(0);
-    if (!hFb)
-        WARN(("no enabled framebuffer found"));
+//    if (!hFb)
+//        WARN(("no enabled framebuffer found"));
     return hFb;
 }