Changeset 54769 in vbox for trunk/src/VBox/HostServices

Timestamp:

Mar 16, 2015 12:06:30 AM (10 years ago)

Author:

vboxsync

Message:

VMSVGA3d: We need no dock tile either, it seems.

File:

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

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

@@ -743 +743 @@
 @end
 
+#ifndef IN_VMSVGA3D
 @class DockOverlayView;
+#endif
 
 /** 
@@ -768 +770 @@
     GLuint              m_FBOId;
 
+#ifndef IN_VMSVGA3D
     /** The corresponding dock tile view of this OpenGL view & all helper
      * members. */
@@ -775 +778 @@
     GLfloat             m_FBOThumbScaleY;
     uint64_t            m_msDockUpdateTS;
+#endif
 
     /** @name For clipping
@@ -832 +836 @@
 - (void)vboxReshapeOnReparentPerform;
 
+#ifndef IN_VMSVGA3D
 - (void)createDockTile;
 - (void)deleteDockTile;
+#endif
 
 - (void)makeCurrentFBO;
@@ -859 +865 @@
 - (GLboolean)vboxNeedsEmptyPresent;
 
+#ifndef IN_VMSVGA3D
 - (NSView *)dockTileScreen;
 - (void)reshapeDockTile;
+#endif
 - (void)cleanupData;
 @end
@@ -904 +912 @@
 
 
+#ifndef IN_VMSVGA3D
 /**
  * Dock overlay view class.
@@ -1059 +1068 @@
 }
 @end
+#endif /* !IN_VMSVGA3D */
 
 
@@ -1380 +1390 @@
     COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
 
+#ifndef IN_VMSVGA3D
     [self deleteDockTile];
+#endif
 
     [self setGLCtx:nil];
@@ -1652 +1664 @@
 
     [self vboxReshapePerform];
+#ifndef IN_VMSVGA3D
     [self createDockTile];
+#endif
 
     /* have to rebind GL_TEXTURE_RECTANGLE_ARB as m_FBOTexId could be changed in updateFBO call */
@@ -1677 +1691 @@
     COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
     [self vboxReshapePerform];
+#ifndef IN_VMSVGA3D
     [self createDockTile];
+#endif
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
@@ -1825 +1841 @@
 - (void)vboxReshapePerform
 {
+#ifndef IN_VMSVGA3D
     COCOA_LOG_FLOW(("%s: self=%p - m_DockTileView=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)m_DockTileView));
+#else
+    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
+#endif
 
     /* NOTE: Please consider the next naming convention for variables.
@@ -1893 +1913 @@
     [[self window] setFrame:windowFrameSCS display:YES];
 
+#ifndef IN_VMSVGA3D
     /* Inform the dock tile view as well. */
     [self reshapeDockTile];
+#endif
 
     /* Make sure the context is updated accordingly. */
@@ -1910 +1932 @@
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
+
+#ifndef IN_VMSVGA3D
 
 - (void)createDockTile
@@ -1944 +1968 @@
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
+
+#endif /* !IN_VMSVGA3D */
 
 - (void)makeCurrentFBO
@@ -2662 +2688 @@
 }
 
+#ifndef IN_VMSVGA3D
+
 - (NSView *)dockTileScreen
 {
@@ -2712 +2740 @@
                     (int)newFrame.origin.y, (int)newFrame.size.width, (int)newFrame.size.height, (void *)pView));
 }
+
+#endif /* !IN_VMSVGA3D */
 
 @end /* @implementation OverlayView */