Changeset 45132 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Mar 21, 2013 4:11:28 PM (12 years ago)

Author:

vboxsync

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

84435

Message:

crOpenGL: seamles mode support impl; bugfizes & cleanup

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (1 diff)
• renderspu.h (modified) (2 diffs)
• renderspu_agl.c (modified) (4 diffs)
• renderspu_cocoa.c (modified) (2 diffs)
• renderspu_cocoa_helper.h (modified) (1 diff)
• renderspu_cocoa_helper.m (modified) (3 diffs)
• renderspu_glx.c (modified) (1 diff)
• renderspu_init.c (modified) (1 diff)
• renderspu_wgl.c (modified) (1 diff)

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

@@ -597 +597 @@
 
 static void RENDER_APIENTRY
-renderspuWindowVisibleRegion(GLint win, GLint cRects, GLint *pRects)
+renderspuWindowVisibleRegion(GLint win, GLint cRects, const GLint *pRects)
 {
     WindowInfo *window;

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

@@ -378 +378 @@
 extern void renderspu_SystemGetMaxWindowSize( WindowInfo *window, GLint *w, GLint *h );
 extern void renderspu_SystemWindowPosition( WindowInfo *window, GLint x, GLint y );
-extern void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, GLint* pRects);
-extern void renderspu_SystemWindowApplyVisibleRegion(WindowInfo *window);
-#ifdef RT_OS_DARWIN
-extern void renderspu_SystemSetRootVisibleRegion(GLint cRects, GLint *pRects);
-#endif
+extern void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, const GLint* pRects);
 
 #ifdef GLX
@@ -428 +424 @@
 #endif
 DECLEXPORT(void) renderspuSetWindowId(uint64_t winId);
-DECLEXPORT(void) renderspuSetRootVisibleRegion(GLint cRects, GLint *pRects);
 DECLEXPORT(void) renderspuReparentWindow(GLint window);
 #ifdef __cplusplus

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

@@ -65 +65 @@
         DEBUG_MSG_RESULT(result, text); \
     }
+
+static void renderspu_SystemWindowApplyVisibleRegion(WindowInfo *window);
+static void renderspu_SystemSetRootVisibleRegion(GLint cRects, GLint *pRects);
 
 /* In some case (like compiz which doesn't provide us with clipping regions) we
@@ -701 +704 @@
 }
 
-void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, GLint* pRects)
+void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, const GLint* pRects)
 {
     CRASSERT(window);
@@ -736 +739 @@
 }
 
-void renderspu_SystemSetRootVisibleRegion(GLint cRects, GLint *pRects)
+static void renderspu_SystemSetRootVisibleRegion(GLint cRects, GLint *pRects)
 {
     /* Remember the visible region of the root window if there is one */
@@ -763 +766 @@
 
 /*Assumes that all regions are in the guest coordinates system*/
-void renderspu_SystemWindowApplyVisibleRegion(WindowInfo *window)
+static void renderspu_SystemWindowApplyVisibleRegion(WindowInfo *window)
 {
     ContextInfo *c = renderspuGetWindowContext(window);

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

@@ -177 +177 @@
 }
 
-void renderspu_SystemWindowVisibleRegion(WindowInfo *pWinInfo, GLint cRects, GLint* paRects)
+void renderspu_SystemWindowVisibleRegion(WindowInfo *pWinInfo, GLint cRects, const GLint* paRects)
 {
     CRASSERT(pWinInfo);
@@ -184 +184 @@
 }
 
-void renderspu_SystemSetRootVisibleRegion(GLint cRects, GLint *paRects)
-{
-}
-
 void renderspu_SystemWindowApplyVisibleRegion(WindowInfo *pWinInfo)
 {

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

@@ -46 +46 @@
 
 void cocoaViewMakeCurrentContext(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx);
-void cocoaViewSetVisibleRegion(NativeNSViewRef pView, GLint cRects, GLint* paRects);
+void cocoaViewSetVisibleRegion(NativeNSViewRef pView, GLint cRects, const GLint* paRects);
 void cocoaViewPresentComposition(NativeNSViewRef pView, struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry);
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -349 +349 @@
 
 - (void)clearVisibleRegions;
-- (void)setVisibleRegions:(GLint)cRects paRects:(GLint*)paRects;
+- (void)setVisibleRegions:(GLint)cRects paRects:(const GLint*)paRects;
 
 - (NSView*)dockTileScreen;
@@ -1380 +1380 @@
 }
 
-- (void)setVisibleRegions:(GLint)cRects paRects:(GLint*)paRects
+- (void)setVisibleRegions:(GLint)cRects paRects:(const GLint*)paRects
 {
     GLint cOldRects = m_cClipRects;
@@ -1729 +1729 @@
 }
 
-void cocoaViewSetVisibleRegion(NativeNSViewRef pView, GLint cRects, GLint* paRects)
+void cocoaViewSetVisibleRegion(NativeNSViewRef pView, GLint cRects, const GLint* paRects)
 {
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];

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

@@ -1893 +1893 @@
 
 void
-renderspu_SystemWindowVisibleRegion( WindowInfo *window, GLint cRects, GLint *pRects )
+renderspu_SystemWindowVisibleRegion( WindowInfo *window, GLint cRects, const GLint *pRects )
 {
 #ifdef USE_OSMESA

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

@@ -538 +538 @@
     render_spu_parent_window_id = winId;
 }
-
-#ifdef RT_OS_DARWIN
-static void renderspuWindowVisibleRegionCB(unsigned long key, void *data1, void *data2)
-{
-    WindowInfo *window = (WindowInfo *) data1;
-    CRASSERT(window);
-
-    renderspu_SystemWindowApplyVisibleRegion(window);
-}
-#endif
-
-DECLEXPORT(void) renderspuSetRootVisibleRegion(GLint cRects, GLint *pRects)
-{
-#ifdef RT_OS_DARWIN
-    renderspu_SystemSetRootVisibleRegion(cRects, pRects);
-
-    crHashtableWalk(render_spu.windowTable, renderspuWindowVisibleRegionCB, NULL);
-#endif
-}
-
-#ifndef RT_OS_DARWIN
-void renderspu_SystemWindowApplyVisibleRegion(WindowInfo *window)
-{
-}
-#endif

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

@@ -1552 +1552 @@
 }
 
-void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, GLint* pRects)
+void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, const GLint* pRects)
 {
     GLint i;