Changeset 46966 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jul 4, 2013 6:08:11 AM (12 years ago)

Author:

vboxsync

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

86974

Message:

wddm/crOpenGL: some bugfixes, more TexPresent fixes

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• defs.py (modified) (1 diff)
• defs64.py (modified) (1 diff)
• wgl.c (modified) (1 diff)

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

@@ -498 +498 @@
 VBoxCreateContext
 VBoxGetWindowId
+VBoxGetContextId
 VBoxFlushToHost"""
 #print "DllMain"

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

@@ -479 +479 @@
 VBoxCreateContext
 VBoxGetWindowId
+VBoxGetContextId
 VBoxFlushToHost"""
 #print "DllMain"

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

@@ -329 +329 @@
 DECLEXPORT(GLint) WINAPI VBoxGetWindowId( HDC hdc )
 {
-    WindowInfo *window = stubGetWindowInfo(hdc);
+    WindowInfo *window;
+    GLint winid = 0;
+
+    CR_DDI_PROLOGUE();
+
+    crHashtableLock(stub.windowTable);
+
+    window = stubGetWindowInfo(hdc);
     if (!window)
     {
-        CRASSERT(0);
         crWarning("stubGetWindowInfo: window not found!");
-        return 0;
+        goto end;
     }
     if (!window->spuWindow)
     {
-        CRASSERT(0);
         crWarning("stubGetWindowInfo: window is null!");
-        return 0;
-    }
-    return window->spuWindow;
-}
+        goto end;
+    }
+
+    winid = window->spuWindow;
+
+end:
+    crHashtableUnlock(stub.windowTable);
+    return winid;
+}
+
+DECLEXPORT(GLint) WINAPI VBoxGetContextId( HGLRC hglrc )
+{
+    ContextInfo *context;
+    GLint ctxid = 0;
+
+    CR_DDI_PROLOGUE();
+
+//    crHashtableLock(stub.windowTable);
+    crHashtableLock(stub.contextTable);
+
+    context = (ContextInfo *) crHashtableSearch(stub.contextTable, (unsigned long) hglrc);
+    if (!context)
+    {
+        crWarning("crHashtableSearch: context not found!");
+        goto end;
+    }
+
+    if (context->type != CHROMIUM)
+    {
+        crWarning("unexpected context type %d", context->type);
+        goto end;
+    }
+
+    if (context->spuContext <= 0)
+    {
+        crWarning("no spuSontext defined");
+        goto end;
+    }
+
+    ctxid = context->spuContext;
+
+end:
+    crHashtableUnlock(stub.contextTable);
+    return ctxid;
+}
+
 
 DECLEXPORT(HGLRC) WINAPI wglCreateContext_prox( HDC hdc )