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

Timestamp:

Feb 20, 2013 3:43:52 PM (12 years ago)

Author:

vboxsync

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

83878

Message:

crOpenGL: host 3d window repaint impl for Win host; enable offscreen rendering for Win; 3D window repaint generics

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/chromium.h (modified) (1 diff)
• include/cr_blitter.h (modified) (1 diff)
• include/cr_hash.h (modified) (2 diffs)
• include/cr_vreg.h (modified) (3 diffs)
• util/blitter.cpp (modified) (2 diffs)
• util/hash.c (modified) (8 diffs)
• util/util.def (modified) (1 diff)
• util/vreg.cpp (modified) (2 diffs)

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

@@ -82 +82 @@
 struct VBOXVR_SCR_COMPOSITOR;
 struct VBOXVR_SCR_COMPOSITOR_ENTRY;
+
+#define CR_RENDER_DEFAULT_CONTEXT_ID (INT32_MAX-1)
+#define CR_RENDER_DEFAULT_WINDOW_ID (INT32_MAX-1)
 
 #if defined(IN_GUEST) && (WINDOWS) && defined(VBOX_WITH_WDDM)

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

@@ -104 +104 @@
 }
 
+DECLINLINE(GLboolean) CrBltIsEverEntered(PCR_BLITTER pBlitter)
+{
+    return !!pBlitter->Flags.Initialized;
+}
+
 VBOXBLITTERDECL(void) CrBltMuralSetCurrent(PCR_BLITTER pBlitter, CR_BLITTER_WINDOW *pMural);
 

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

@@ -25 +25 @@
 
 DECLEXPORT(CRHashIdPool *) crAllocHashIdPool( void );
+DECLEXPORT(CRHashIdPool *) crAllocHashIdPoolEx( GLuint min, GLuint max );
 DECLEXPORT(void) crFreeHashIdPool( CRHashIdPool *pool );
 DECLEXPORT(GLboolean) crHashIdPoolIsIdFree( const CRHashIdPool *pool, GLuint id );
@@ -32 +33 @@
 
 DECLEXPORT(CRHashTable *) crAllocHashtable( void );
+DECLEXPORT(CRHashTable *) crAllocHashtableEx( GLuint min, GLuint max );
 DECLEXPORT(void) crFreeHashtable( CRHashTable *hash, CRHashtableCallback deleteCallback );
 DECLEXPORT(void) crHashtableAdd( CRHashTable *h, unsigned long key, void *data );

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

@@ -24 +24 @@
 #include <iprt/string.h>
 #include <iprt/assert.h>
+#include <iprt/critsect.h>
 
 #ifndef IN_RING0
@@ -244 +245 @@
     PRTRECT paSrcRects;
     PRTRECT paDstRects;
+    RTCRITSECT CritSect;
 } VBOXVR_SCR_COMPOSITOR, *PVBOXVR_SCR_COMPOSITOR;
 
@@ -320 +322 @@
 }
 
+DECLINLINE(int) CrVrScrCompositorLock(PVBOXVR_SCR_COMPOSITOR pCompositor)
+{
+    int rc = RTCritSectEnter(&pCompositor->CritSect);
+    AssertRC(rc);
+    return rc;
+}
+
+DECLINLINE(int) CrVrScrCompositorUnlock(PVBOXVR_SCR_COMPOSITOR pCompositor)
+{
+    int rc = RTCritSectLeave(&pCompositor->CritSect);
+    AssertRC(rc);
+    return rc;
+}
+
 RT_C_DECLS_END
 

trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

@@ -431 +431 @@
     else
     {
-        Assert(0);
         pBlitter->pDispatch->MakeCurrent(0, 0, 0);
     }
@@ -475 +474 @@
     else
     {
-        Assert(0);
         pBlitter->pRestoreCtxInfo = &pBlitter->CtxInfo;
-
     }
 

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

@@ -26 +26 @@
 struct CRHashIdPool {
     RTLISTNODE freeList;
+    GLuint min;
+    GLuint max;
 };
 
@@ -44 +46 @@
 
 
+CRHashIdPool *crAllocHashIdPoolEx( GLuint min, GLuint max )
+{
+    CRHashIdPool *pool;
+    FreeElem *elem;
+    if (min < CR_HASH_ID_MIN || max > CR_HASH_ID_MAX || min >= max)
+    {
+        crWarning("invalid min man vals");
+        return NULL;
+    }
+    pool = (CRHashIdPool *) crCalloc(sizeof(CRHashIdPool));
+    elem = (FreeElem *) crCalloc(sizeof(FreeElem));
+    RTListInit(&pool->freeList);
+    elem->min = min;
+    elem->max = max;
+    RTListAppend(&pool->freeList, &elem->Node);
+    pool->min = min;
+    pool->max = max;
+    return pool;
+}
+
 CRHashIdPool *crAllocHashIdPool( void )
 {
-    CRHashIdPool *pool = (CRHashIdPool *) crCalloc(sizeof(CRHashIdPool));
-    FreeElem *elem = (FreeElem *) crCalloc(sizeof(FreeElem));
-    RTListInit(&pool->freeList);
-    elem->min = CR_HASH_ID_MIN;
-    elem->max = CR_HASH_ID_MAX;
-    RTListAppend(&pool->freeList, &elem->Node);
-    return pool;
+    return crAllocHashIdPoolEx( CR_HASH_ID_MIN, CR_HASH_ID_MAX );
 }
 
@@ -78 +94 @@
     RTListForEach(&pool->freeList, i, FreeElem, Node)
     {
-        Assert(i->min >= CR_HASH_ID_MIN);
-        Assert(i->max <= CR_HASH_ID_MAX);
+        Assert(i->min >= pool->min);
+        Assert(i->max <= pool->max);
         Assert(i->min < i->max);
     }
@@ -96 +112 @@
     GLuint i;
     CRASSERT(count);
-    CRASSERT(start >= CR_HASH_ID_MIN);
-    CRASSERT(start + count <= CR_HASH_ID_MAX);
+    CRASSERT(start >= pool->min);
+    CRASSERT(start + count <= pool->max);
     CRASSERT(start + count >  start);
     for (i = 0; i < count; ++i)
@@ -175 +191 @@
     CRASSERT(count > 0);
     CRASSERT(last > first);
-    CRASSERT(first >= CR_HASH_ID_MIN);
-    CRASSERT(last <= CR_HASH_ID_MAX);
+    CRASSERT(first >= pool->min);
+    CRASSERT(last <= pool->max);
 
     /* the id list is sorted, first find a place to insert */
@@ -317 +333 @@
     FreeElem *f;
     CRASSERT(id >= 0);
-    CRASSERT(id <= CR_HASH_ID_MAX);
+    CRASSERT(id <= pool->max);
 
     RTListForEach(&pool->freeList, f, FreeElem, Node)
@@ -330 +346 @@
 }
 
-
-
-CRHashTable *crAllocHashtable( void )
+CRHashTable *crAllocHashtableEx( GLuint min, GLuint max )
 {
     int i;
@@ -341 +355 @@
         hash->buckets[i] = NULL;
     }
-    hash->idPool = crAllocHashIdPool();
+    hash->idPool = crAllocHashIdPoolEx( min, max );
 #ifdef CHROMIUM_THREADSAFE
     crInitMutex(&hash->mutex);
 #endif
     return hash;
+}
+
+CRHashTable *crAllocHashtable( void )
+{
+    return crAllocHashtableEx(CR_HASH_ID_MIN, CR_HASH_ID_MAX);
 }
 

trunk/src/VBox/GuestHost/OpenGL/util/util.def

@@ -85 +85 @@
 crHashtableAllocRegisterKey
 crAllocHashtable
+crAllocHashtableEx
 crFreeHashtable
 crHashtableGetDataKey

trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp

@@ -1416 +1416 @@
 {
     memset(pCompositor, 0, sizeof (*pCompositor));
-    VBoxVrCompositorInit(&pCompositor->Compositor, NULL);
-    pCompositor->StretchX = 1.0;
-    pCompositor->StretchY = 1.0;
-    return VINF_SUCCESS;
+    int rc = RTCritSectInit(&pCompositor->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        VBoxVrCompositorInit(&pCompositor->Compositor, NULL);
+        pCompositor->StretchX = 1.0;
+        pCompositor->StretchY = 1.0;
+        return VINF_SUCCESS;
+    }
+    else
+    {
+        crWarning("RTCritSectInit failed rc %d", rc);
+    }
+    return rc;
 }
 
@@ -1429 +1438 @@
     if (pCompositor->paSrcRects)
         RTMemFree(pCompositor->paSrcRects);
+
+    RTCritSectDelete(&pCompositor->CritSect);
 }