Changeset 54770 in vbox

Timestamp:

Mar 16, 2015 12:15:01 AM (10 years ago)

Author:

vboxsync

Message:

VMSVGA3d: Some more cleanups.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (10 diffs)

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

@@ -2963 +2963 @@
 }
 
+#ifndef IN_VMSVGA3D
 void cocoaViewReparent(NativeNSViewRef pView, NativeNSViewRef pParentView)
 {
@@ -2975 +2976 @@
     COCOA_LOG_FLOW(("cocoaViewReparent: returns\n"));
 }
+#endif /* !IN_VMSVGA3D */
 
 void cocoaViewDestroy(NativeNSViewRef pView)
@@ -2988 +2990 @@
 }
 
+#ifndef IN_VMSVGA3D
 void cocoaViewShow(NativeNSViewRef pView, GLboolean fShowIt)
 {
@@ -2998 +3001 @@
     COCOA_LOG_FLOW(("cocoaViewShow: returns\n"));
 }
+#endif /* IN_VMSVGA3D */
 
 void cocoaViewDisplay(NativeNSViewRef pView)
@@ -3052 +3056 @@
 }
 
-#endif /* !IN_VMSVGA3D */
-
 void cocoaViewGetGeometry(NativeNSViewRef pView, int *px, int *py, int *pcx, int *pcy)
 {
@@ -3095 +3097 @@
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
     NSOpenGLContext *pCtx;
-    
-    /* view should not necesserily have a context set */
+
+# ifdef IN_VMSVGA3D
+    Assert([(OverlayView *)pView glCtx]);
+
+# else
+    /* The view may not necesserily have a GL context set. */
     pCtx = [(OverlayView *)pView glCtx];
     if (!pCtx)
     {
-#ifdef IN_VMSVGA3D /** @todo VMSVGA3 */
-        pCtx = NULL;
-#else
         ContextInfo *pCtxInfo = renderspuDefaultSharedContextAcquire();
         if (!pCtxInfo)
@@ -3114 +3117 @@
         
         pCtx = pCtxInfo->context;
-#endif
         
         [(OverlayView *)pView setGLCtx:pCtx];
     }
+# endif
     
     [(OverlayView *)pView presentComposition:pChangedEntry];
@@ -3124 +3127 @@
     COCOA_LOG_FLOW(("cocoaViewPresentComposition: returns\n"));
 }
+
+#endif /* !IN_VMSVGA3D */
 
 void cocoaViewMakeCurrentContext(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx)
@@ -3154 +3159 @@
 }
 
+#ifndef IN_VMSVGA3D
+
 GLboolean cocoaViewNeedsEmptyPresent(NativeNSViewRef pView)
 {
@@ -3177 +3184 @@
 }
 
+#endif /* IN_VMSVGA3D */
 
 #ifdef IN_VMSVGA3D