Changeset 43487 in vbox for trunk/src/VBox

Timestamp:

Oct 1, 2012 11:53:15 AM (12 years ago)

Author:

vboxsync

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

81047

Message:

crOpenGL/wddm: basics for miniport-based visible rects processing (guest part); export flushToHost command

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/context.c (modified) (2 diffs)
• Additions/common/crOpenGL/defs.py (modified) (1 diff)
• Additions/common/crOpenGL/defs64.py (modified) (1 diff)
• Additions/common/crOpenGL/load.c (modified) (6 diffs)
• Additions/common/crOpenGL/pack/packspu_context.c (modified) (1 diff)
• Additions/common/crOpenGL/stub.h (modified) (1 diff)
• Additions/common/crOpenGL/wgl.c (modified) (1 diff)
• GuestHost/OpenGL/include/cr_pack.h (modified) (1 diff)
• GuestHost/OpenGL/packer/pack_buffer.c (modified) (3 diffs)
• GuestHost/OpenGL/packer/pack_visibleregion.c (modified) (2 diffs)
• GuestHost/OpenGL/packer/packer.py (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/context.c

@@ -108 +108 @@
 }
 
+void stubConFlush(GLint con)
+{
+    if (con)
+        stub.spu->dispatch_table.VBoxConFlush(con);
+    else
+        crError("stubConFlush called with null connection");
+}
+
 static void stubWindowCleanupForContextsCB(unsigned long key, void *data1, void *data2)
 {
@@ -190 +198 @@
     if (stub.bRunningUnderWDDM)
     {
-        crError("Should not be here: WindowCreate/Destroy & VBoxPackGetInjectID recuire connection id!");
+        crError("Should not be here: WindowCreate/Destroy & VBoxPackGetInjectID require connection id!");
         winInfo->mapped = 0;
     }

trunk/src/VBox/Additions/common/crOpenGL/defs.py

@@ -496 +496 @@
 crSwapBuffers
 crGetProcAddress
-VBoxCreateContext"""
+VBoxCreateContext
+VBoxGetWindowId
+VBoxFlushToHost"""
 #print "DllMain"

trunk/src/VBox/Additions/common/crOpenGL/defs64.py

@@ -477 +477 @@
 crSwapBuffers
 crGetProcAddress
-VBoxCreateContext"""
+VBoxCreateContext
+VBoxGetWindowId
+VBoxFlushToHost"""
 #print "DllMain"

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -974 +974 @@
     }
 }
-# endif
+# endif /* VBOX_WITH_WDDM */
 
 static void stubSyncTrCheckWindowsCB(unsigned long key, void *data1, void *data2)
@@ -1054 +1054 @@
                     stub.trackWindowVisibleRgn = 0;
                     stub.bRunningUnderWDDM = true;
+#ifdef VBOX_WDDM_MINIPORT_WITH_VISIBLE_RECTS
+                    crError("should not be here, visible rects should be processed in miniport!");
+#endif
                 }
             }
@@ -1164 +1167 @@
     return 0;
 }
-#endif
+#endif /* CR_NEWWINTRACK */
 
 /**
@@ -1204 +1207 @@
         disable_sync = 1;
     }
+#elif defined(WINDOWS) && defined(VBOX_WITH_WDDM) && defined(VBOX_WDDM_MINIPORT_WITH_VISIBLE_RECTS)
+    if (GetModuleHandle(VBOX_MODNAME_DISPD3D))
+    {
+        disable_sync = 1;
+        crDebug("running with " VBOX_MODNAME_DISPD3D);
+        stub.trackWindowVisibleRgn = 0;
+        stub.bRunningUnderWDDM = true;
+    }
 #endif
 
@@ -1367 +1378 @@
 #ifdef VDBG_VEHANDLER
 static PVOID g_VBoxWDbgVEHandler = NULL;
+static DWORD g_VBoxWDbgVEHExit = 1;
 LONG WINAPI vboxVDbgVectoredHandler(struct _EXCEPTION_POINTERS *pExceptionInfo)
 {
@@ -1382 +1394 @@
         case EXCEPTION_ILLEGAL_INSTRUCTION:
             CRASSERT(0);
+            if (g_VBoxWDbgVEHExit)
+                exit(1);
             break;
         default:

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c

@@ -131 +131 @@
     CRASSERT(thread->packer);
     packspuFlush((void *) thread);
+#else
+    crError("VBoxConFlush not implemented!");
 #endif
 }

trunk/src/VBox/Additions/common/crOpenGL/stub.h

@@ -355 +355 @@
 
 extern void stubForcedFlush(GLint con);
+extern void stubConFlush(GLint con);
 extern void APIENTRY stub_GetChromiumParametervCR( GLenum target, GLuint index, GLenum type, GLsizei count, GLvoid *values );
 

trunk/src/VBox/Additions/common/crOpenGL/wgl.c

@@ -325 +325 @@
 }
 
+GLint WINAPI VBoxGetWindowId( HDC hdc )
+{
+    WindowInfo *window = stubGetWindowInfo(hdc);
+    if (!window)
+    {
+        CRASSERT(0);
+        crWarning("stubGetWindowInfo: window not found!");
+        return 0;
+    }
+    if (!window->spuWindow)
+    {
+        CRASSERT(0);
+        crWarning("stubGetWindowInfo: window is null!");
+        return 0;
+    }
+    return window->spuWindow;
+}
+
 HGLRC WINAPI wglCreateContext_prox( HDC hdc )
 {
     return VBoxCreateContext(hdc, NULL);
+}
+
+void WINAPI VBoxFlushToHost ( HGLRC hglrc )
+{
+    ContextInfo *context;
+
+    CR_DDI_PROLOGUE();
+
+//    crHashtableLock(stub.windowTable);
+    crHashtableLock(stub.contextTable);
+
+    context = (ContextInfo *) crHashtableSearch(stub.contextTable, (unsigned long) hglrc);
+
+    if (context)
+        stubConFlush(CR_CTX_CON(context));
+
+    crHashtableUnlock(stub.contextTable);
+//    crHashtableUnlock(stub.windowTable);
 }
 

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

@@ -118 +118 @@
 extern DECLEXPORT(int) crPackMaxOpcodes( int buffer_size );
 extern DECLEXPORT(int) crPackMaxData( int buffer_size );
-extern DECLEXPORT(void) crPackInitBuffer( CRPackBuffer *buffer, void *buf, int size, int mtu );
+extern DECLEXPORT(void) crPackInitBuffer( CRPackBuffer *buffer, void *buf, int size, int mtu
+#ifdef IN_RING0
+        , unsigned int num_opcodes
+#endif
+        );
 extern DECLEXPORT(void) crPackFlushFunc( CRPackContext *pc, CRPackFlushFunc ff );
 extern DECLEXPORT(void) crPackFlushArg( CRPackContext *pc, void *flush_arg );

trunk/src/VBox/GuestHost/OpenGL/packer/pack_buffer.c

@@ -150 +150 @@
         CRPackBuffer *buf = pc->currentBuffer;
         CRASSERT(buf);
-        crPackInitBuffer( buf, buf->pack, buf->size, buf->mtu );
+        crPackInitBuffer( buf, buf->pack, buf->size, buf->mtu
+#ifdef IN_RING0
+                , 0
+#endif
+                );
         pc->buffer.geometry_only = geom_only;   /* restore the flag */
         pc->buffer.holds_BeginEnd = holds_BeginEnd;
@@ -222 +226 @@
  *              be somewhat smaller than the buffer size.
  */
-void crPackInitBuffer( CRPackBuffer *buf, void *pack, int size, int mtu )
-{
+void crPackInitBuffer( CRPackBuffer *buf, void *pack, int size, int mtu
+#ifdef IN_RING0
+        , unsigned int num_opcodes
+#endif
+        )
+{
+#ifndef IN_RING0
         unsigned int num_opcodes;
+#endif
 
         CRASSERT(mtu <= size);
@@ -232 +242 @@
         buf->pack = pack;
 
-        num_opcodes = crPackMaxOpcodes( buf->size );
+#ifdef IN_RING0
+        if(!num_opcodes)
+#endif
+        {
+            num_opcodes = crPackMaxOpcodes( buf->size );
+        }
 
         buf->data_start    = 

trunk/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c

@@ -23 +23 @@
 #endif
 
-void PACK_APIENTRY crPackWindowVisibleRegion( GLint window, GLint cRects, GLint * pRects )
+void PACK_APIENTRY crPackWindowVisibleRegion( CR_PACKER_CONTEXT_ARGDECL GLint window, GLint cRects, GLint * pRects )
 {
     GLint i, size, cnt;
@@ -50 +50 @@
 }
 
-void PACK_APIENTRY crPackWindowVisibleRegionSWAP( GLint window, GLint cRects, GLint * pRects )
+void PACK_APIENTRY crPackWindowVisibleRegionSWAP( CR_PACKER_CONTEXT_ARGDECL  GLint window, GLint cRects, GLint * pRects )
 {
     crError( "crPackWindowVisibleRegionSWAP unimplemented and shouldn't be called" );

trunk/src/VBox/GuestHost/OpenGL/packer/packer.py

@@ -114 +114 @@
     """Emit a packer function."""
     if is_swapped:
-        print 'void PACK_APIENTRY crPack%sSWAP( %s )' % (func_name, apiutil.MakeDeclarationString(params))
-    else:
-        print 'void PACK_APIENTRY crPack%s( %s )' % (func_name, apiutil.MakeDeclarationString(params))
+        print 'void PACK_APIENTRY crPack%sSWAP( %s )' % (func_name, apiutil.MakeDeclarationStringWithContext('CR_PACKER_CONTEXT', params))
+    else:
+        print 'void PACK_APIENTRY crPack%s( %s )' % (func_name, apiutil.MakeDeclarationStringWithContext('CR_PACKER_CONTEXT', params))
     print '{'
     print '\tCR_GET_PACKER_CONTEXT(pc);'