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

Timestamp:

Mar 15, 2015 11:58:32 PM (10 years ago)

Author:

vboxsync

Message:

VMSVGA3d: Eliminated the CR blitter dependencies, we don't need it (at the moment at least).

File:

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

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

@@ -793 +793 @@
     float               m_yInvRootOffset;
     
+#ifndef IN_VMSVGA3D
     CR_BLITTER         *m_pBlitter;
-#ifndef IN_VMSVGA3D
     WindowInfo         *m_pWinInfo;
 #endif
@@ -851 +851 @@
 - (void)vboxPresentToViewCS:(const VBOXVR_SCR_COMPOSITOR *)pCompositor;
 - (void)presentComposition:(const VBOXVR_SCR_COMPOSITOR_ENTRY *)pChangedEntry;
+#ifndef IN_VMSVGA3D
 - (void)vboxBlitterSyncWindow;
+#endif
 
 - (void)clearVisibleRegions;
@@ -1353 +1355 @@
     m_RootRect                = NSMakeRect(0, 0, m_Size.width, m_Size.height);
     m_yInvRootOffset          = 0;
+#ifndef IN_VMSVGA3D
     m_pBlitter                = nil;
-#ifndef IN_VMSVGA3D
     m_pWinInfo                = pWinInfo;
 #endif
@@ -1390 +1392 @@
         m_pSharedGLCtx = nil;
         
+
+#ifndef IN_VMSVGA3D
         CrBltTerm(m_pBlitter);
         RTMemFree(m_pBlitter);
         m_pBlitter = nil;
+#endif
     }
 
@@ -1632 +1637 @@
     [m_pSharedGLCtx update];
 
+#ifndef IN_VMSVGA3D
     [self vboxBlitterSyncWindow];
+#endif
         
     /* Clear background to transparent. */
@@ -2007 +2014 @@
     }
         
+#ifndef IN_VMSVGA3D            
     Assert(!m_pBlitter);
     m_pBlitter = RTMemAlloc(sizeof(*m_pBlitter));
@@ -2017 +2025 @@
         
     int rc = CrBltInit(m_pBlitter, NULL, false /*fCreateNewCtx*/, false /*fForceDrawBlt*/, 
-#ifdef IN_VMSVGA3D
-                       NULL /** @todo */, NULL /** @todo */
-#else
-                       &render_spu.GlobalShaders, &render_spu.blitterDispatch
-#endif
-                       );
+                       &render_spu.GlobalShaders, &render_spu.blitterDispatch);
     if (RT_FAILURE(rc))
     {
@@ -2034 +2037 @@
 
     COCOA_LOG_FLOW(("%s: blitter (%p) created successfully for view 0x%p\n", (void *)m_pBlitter, (void *)self));
+#endif /* !IN_VMSVGA3D */
 
     /* Create a shared context out of the main context. Use the same pixel format. */
@@ -2441 +2445 @@
 }
 
+#ifndef IN_VMSVGA3D
 - (void)vboxBlitterSyncWindow
 {
@@ -2464 +2469 @@
     CrBltCheckUpdateViewport(m_pBlitter);
 }
+#endif /* !IN_VMSVGA3D */
 
 #ifndef IN_VMSVGA3D