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

Timestamp:

Aug 27, 2009 10:05:18 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: Allow 64bit window ids for the parent window.

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (3 diffs)
• render/renderspu.h (modified) (2 diffs)
• render/renderspu_init.c (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -85 +85 @@
 {
     uint64_t winId = *((uint64_t*)pv);
-    renderspuSetWindowId((uint32_t)winId);
+    renderspuSetWindowId(winId);
     CRServerMain(0, NULL);
     crIsThreadWorking = 0;
@@ -132 +132 @@
 #else
     g_pFrameBuffer->COMGETTER(WinId)(&g_winId);
-    renderspuSetWindowId((uint32_t)g_winId);
+    renderspuSetWindowId(g_winId);
     rc = crVBoxServerAddClient(u32ClientID);
 #endif
@@ -238 +238 @@
     /*MS's opengl32 tryes to load our ICD around 30 times on failure...this is to prevent unnecessary spam*/
     static int shown = 0;
-    
+
     if (g_pVM && !shown)
     {

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -252 +252 @@
 
 /* @todo remove this hack */
-extern unsigned int render_spu_parent_window_id;
+extern uint64_t render_spu_parent_window_id;
 
 #ifdef CHROMIUM_THREADSAFE
@@ -293 +293 @@
 extern "C" {
 #endif
-DECLEXPORT(void) renderspuSetWindowId(unsigned int winId);
+DECLEXPORT(void) renderspuSetWindowId(uint64_t winId);
 DECLEXPORT(void) renderspuSetRootVisibleRegion(GLint cRects, GLint *pRects);
 #ifdef __cplusplus

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -26 +26 @@
 
 RenderSPU render_spu;
-unsigned int render_spu_parent_window_id;
+uint64_t render_spu_parent_window_id;
 
 #ifdef CHROMIUM_THREADSAFE
@@ -435 +435 @@
 }
 
-DECLEXPORT(void) renderspuSetWindowId(unsigned int winId)
+DECLEXPORT(void) renderspuSetWindowId(uint64_t winId)
 {
     render_spu_parent_window_id = winId;