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

Timestamp:

Oct 26, 2017 5:17:51 PM (7 years ago)

Author:

vboxsync

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

118714

Message:

HostServices/SharedOpenGL: scm updates

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• render.def (modified) (1 prop)
• renderspu.c (modified) (1 prop)
• renderspu_agl.c (modified) (1 prop)
• renderspu_cocoa.c (modified) (1 diff)
• renderspu_cocoa_helper.m (modified) (125 diffs)
• renderspu_config.c (modified) (1 prop)
• renderspu_glx.c (modified) (1 prop)
• renderspu_init.c (modified) (1 diff, 1 prop)
• renderspu_wgl.c (modified) (1 diff, 1 prop)

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

@@ +1 @@
+/* $Id$ */
 /** @file
  * VirtualBox OpenGL Cocoa Window System implementation

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

@@ -62 +62 @@
  *   this is our own one, before use. Really neat concept of Objective-C/Cocoa
  *   ;)
- * 
+ *
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #ifdef IN_VMSVGA3D
 # define LOG_GROUP LOG_GROUP_DEV_VMSVGA
@@ -108 +109 @@
 
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 /* Debug macros */
-/** @def FBO 
+/** @def FBO
  * Disable this to see how the output is without the FBO in the middle of the processing chain. */
 #define FBO 1
 /** @def CR_RENDER_FORCE_PRESENT_MAIN_THREAD
- * Force present schedule to main thread. */ 
+ * Force present schedule to main thread. */
 /** @def SHOW_WINDOW_BACKGROUND
- * Define this to see the window background even if the window is clipped. */ 
-/** @def DEBUG_VERBOSE 
+ * Define this to see the window background even if the window is clipped. */
+/** @def DEBUG_VERBOSE
  * Define this to get some debug info about the messages flow. */
 #if 0 || defined(DOXYGEN_RUNNING)
@@ -204 +205 @@
         if (RT_UNLIKELY(iGlCheckErr != GL_NO_ERROR)) \
             AssertMsgFailed((a_szOp ": iGlCheckErr=%#x\n", iGlCheckErr)); \
-    } while (0) 
+    } while (0)
 #else
 # define DEBUG_CLEAR_GL_ERRORS()        do {} while (0)
@@ -240 +241 @@
 
 /**
- * Works functions that creates a NSOpenGLPixelFormat instance. 
- *  
+ * Works functions that creates a NSOpenGLPixelFormat instance.
+ *
  * @returns Instance.
  * @param   fVisParams          Context flags.
@@ -367 +368 @@
         fAdjusted = true;
     }
-    
+
     return fAdjusted;
 #endif
@@ -373 +374 @@
 
 
-/** 
- * State carrying structure for use with vboxCtxEnter and vboxCtxLeave 
- */ 
+/**
+ * State carrying structure for use with vboxCtxEnter and vboxCtxLeave
+ */
 typedef struct VBOX_CR_RENDER_CTX_INFO
 {
@@ -387 +388 @@
 static void vboxCtxEnter(NSOpenGLContext *pNewCtx, PVBOX_CR_RENDER_CTX_INFO pCtxInfo)
 {
-    NSOpenGLContext *pOldCtx  = vboxCtxGetCurrent(); 
+    NSOpenGLContext *pOldCtx  = vboxCtxGetCurrent();
     NSView          *pOldView = pOldCtx ? [pOldCtx view] : nil;
     NSView          *pNewView = [pNewCtx view];
@@ -393 +394 @@
     Assert(pNewCtx);
 
-    if (   pOldCtx  != pNewCtx 
+    if (   pOldCtx  != pNewCtx
         || pOldView != pNewView)
     {
         if (pOldCtx != nil)
             glFlush();
-        
+
         DEBUG_CLEAR_GL_ERRORS();
         [pNewCtx makeCurrentContext];
         DEBUG_CHECK_GL_ERROR("makeCurrentContext");
-        
+
         pCtxInfo->fIsValid = true;
         pCtxInfo->pCtx     = pOldCtx;
         /** @todo r=bird: Why do we save the NEW VIEW here? vboxCtxLeave calls it 'pOldView'. Bug? */
-        pCtxInfo->pView    = pNewView; 
+        pCtxInfo->pView    = pNewView;
     }
     else
@@ -413 +414 @@
         pCtxInfo->fIsValid = false;
     }
-}    
-    
+}
+
 static void vboxCtxLeave(PVBOX_CR_RENDER_CTX_INFO pCtxInfo)
 {
@@ -421 +422 @@
         NSOpenGLContext *pOldCtx  = pCtxInfo->pCtx;
         NSView          *pOldView = pCtxInfo->pView;
-    
+
         glFlush();
         if (pOldCtx != nil)
@@ -430 +431 @@
             /** @todo r=bird: Figure out what we really want to do here, and either rename
              *        pOldView or fix the code. */
-            if ([pOldCtx view] != pOldView) 
+            if ([pOldCtx view] != pOldView)
             {
                 DEBUG_CLEAR_GL_ERRORS();
@@ -436 +437 @@
                 DEBUG_CHECK_GL_ERROR("setView");
             }
-        
+
             DEBUG_CLEAR_GL_ERRORS();
             [pOldCtx makeCurrentContext];
             DEBUG_CHECK_GL_ERROR("makeCurrentContext");
-            
+
 #ifdef VBOX_STRICT
             {
@@ -458 +459 @@
 
 
-/** 
+/**
  * Custom OpenGL context class.
  *
  * This implementation doesn't allow to set a view to the context, but save the
- * view for later use.  Also it saves a copy of the pixel format used to create 
- * that context for later use. 
- */ 
+ * view for later use.  Also it saves a copy of the pixel format used to create
+ * that context for later use.
+ */
 @interface OverlayOpenGLContext: NSOpenGLContext
 {
@@ -509 +510 @@
 
 @implementation VBoxTaskPerformSelector
-    
+
 /**
  * Initializes a VBoxTaskPerformSelector.
- *  
+ *
  * @param   aObject             The object (reference not consumed).
  * @param   aSelector           The method selector.
@@ -550 +551 @@
 
 /**
- * 
+ *
  */
 @interface VBoxTaskComposite : VBoxTask
@@ -589 +590 @@
 /**
  * Adds a task to the composite task object.
- *  
+ *
  * @param   pTask               Task to add.  Reference is NOT consumed.
  */
@@ -621 +622 @@
             break;
         }
-        
+
         NSUInteger count = [m_pArray count];
         Assert(m_CurIndex <= count);
@@ -634 +635 @@
         VBoxTask *pTask = (VBoxTask *)[m_pArray objectAtIndex:m_CurIndex];
         Assert(pTask != nil);
-        
+
         ++m_CurIndex;
-        
+
         /*
          * Remove the first 1025 empty entires.
@@ -649 +650 @@
         }
         RTCritSectLeave(&m_Lock);
-        
+
         /*
          * Run the task and release it.
@@ -667 +668 @@
         [pTask release];
     }
-    
+
     [m_pArray release];
     RTCritSectDelete(&m_Lock);
@@ -677 +678 @@
 
 /**
- * 
- * 
+ *
+ *
  */
 @interface VBoxMainThreadTaskRunner : NSObject
@@ -702 +703 @@
         m_pTasks = [[VBoxTaskComposite alloc] init];
     }
-    
+
     return self;
 }
@@ -728 +729 @@
         [self performSelectorOnMainThread:@selector(runTasks) withObject:nil waitUntilDone:NO];
     }
-    
+
     DEBUG_FUNC_LEAVE();
 }
@@ -734 +735 @@
 /**
  * Adds a task calling an object method (selector).
- *  
+ *
  * @param   aObject             The object (reference not consumed)..
  * @param   aSelector           The method selector.
@@ -746 +747 @@
 }
 
-    
+
 /**
  * Internal method for running the pending tasks.
@@ -757 +758 @@
         /** @todo r=bird: This release and the retain in the add method aren't
          *        necessarily balanced if there are more than one call to add().
-         *  
+         *
          *  This could probably end up deleting the singleton prematurely and leave
          *  globalInstance() returning pointers to a stale object in freed memory,
@@ -773 +774 @@
 }
 
-/** 
- * Callback for calling runTasks via renderspuCalloutClient. 
- * @param   pvUser      The VBoxMainThreadTaskRunner singleton. 
- */ 
+/**
+ * Callback for calling runTasks via renderspuCalloutClient.
+ * @param   pvUser      The VBoxMainThreadTaskRunner singleton.
+ */
 static DECLCALLBACK(void) VBoxMainThreadTaskRunner_RcdRunCallback(void *pvUser)
 {
@@ -786 +787 @@
 }
 
-/** 
- * Runs pending tasks synchronously, if possible in the current context. 
- *  
+/**
+ * Runs pending tasks synchronously, if possible in the current context.
+ *
  * @returns true if executed tasks, false if not possible.
  */
@@ -794 +795 @@
 {
 #ifndef IN_VMSVGA3D
-    /* 
+    /*
      * Call on main thread (?) via renderspuCalloutClient (whatever that is).
      */
@@ -804 +805 @@
     }
 #endif
-    
+
     /*
      * Run directly if on main thread.
@@ -813 +814 @@
         return true;
     }
-    
+
     /* Not possible. */
     return false;
@@ -834 +835 @@
 #endif
 
-/** 
- * The custom view class. 
- *  
- * This is the main class of the cocoa OpenGL implementation.  It manages a 
- * frame buffer object for the rendering of the guest applications.  The guest 
+/**
+ * The custom view class.
+ *
+ * This is the main class of the cocoa OpenGL implementation.  It manages a
+ * frame buffer object for the rendering of the guest applications.  The guest
  * applications render in this frame buffer which is bound to an OpenGL texture.
- * To display the guest content, a secondary shared OpenGL context of the main 
+ * To display the guest content, a secondary shared OpenGL context of the main
  * OpenGL context is created.  The secondary context is marked as non-opaque and
- * the texture is displayed on an object which is composed out of the several 
- * visible region rectangles. 
- */ 
+ * the texture is displayed on an object which is composed out of the several
+ * visible region rectangles.
+ */
 @interface OverlayView : NSView
 {
@@ -850 +851 @@
     NSView             *m_pParentView;
     NSWindow           *m_pOverlayWin;
-                       
+
     NSOpenGLContext    *m_pGLCtx;
     NSOpenGLContext    *m_pSharedGLCtx;
     RTTHREAD            m_Thread;
-                       
+
     GLuint              m_FBOId;
 
@@ -875 +876 @@
 
     /** @name Position/Size tracking
-     * @{ */ 
+     * @{ */
     NSPoint             m_Pos;
     NSSize              m_Size;
@@ -883 +884 @@
     NSRect              m_RootRect;
     float               m_yInvRootOffset;
-    
+
 #ifndef IN_VMSVGA3D
     CR_BLITTER         *m_pBlitter;
@@ -894 +895 @@
     bool                m_fEverSized;
 }
-- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView *)pParentView winInfo:(WindowInfo *)pWinInfo 
+- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView *)pParentView winInfo:(WindowInfo *)pWinInfo
          fVisParams:(GLbitfield) fVisParams;
 - (void)setGLCtx:(NSOpenGLContext*)pCtx;
@@ -960 +961 @@
 @end
 
-/** 
+/**
  * Helper view.
  *
@@ -967 +968 @@
  * (which happens on fullscreen/seamless entry/exit) the overlay
  * window is informed & can add them self as a child window
- * again. 
- */ 
+ * again.
+ */
 @class OverlayWindow;
 @interface OverlayHelperView: NSView
@@ -978 +979 @@
 @end
 
-/** 
+/**
  * Custom window class.
  *
@@ -984 +985 @@
  * Its a direct child of the Qt Main window. It marks its background
  * transparent & non opaque to make clipping possible. It also disable mouse
- * events and handle frame change events of the parent view. 
- */ 
+ * events and handle frame change events of the parent view.
+ */
 @interface OverlayWindow : NSWindow
 {
@@ -1027 +1028 @@
     if (self)
     {
-        /* 
+        /*
          * We need a lock cause the thumb image could be accessed from the main
          * thread when someone is calling display on the dock tile & from the
-         * OpenGL thread when the thumbnail is updated. 
-         */ 
+         * OpenGL thread when the thumbnail is updated.
+         */
         m_Lock = [[NSLock alloc] init];
     }
 
     DEBUG_FUNC_LEAVE();
-    
+
     return self;
 }
@@ -1043 +1044 @@
 {
     DEBUG_FUNC_ENTER();
-    
+
     [self cleanup];
     [m_Lock release];
 
     [super dealloc];
-    
+
     DEBUG_FUNC_LEAVE();
 }
@@ -1055 +1056 @@
 {
     DEBUG_FUNC_ENTER();
-    
+
     if (m_ThumbImage != nil)
     {
@@ -1067 +1068 @@
         m_ThumbBitmap = nil;
     }
-    
+
     DEBUG_FUNC_LEAVE();
 }
@@ -1191 +1192 @@
 
     [super dealloc];
-    
+
     DEBUG_FUNC_LEAVE();
 }
@@ -1201 +1202 @@
     GLint val;
     [m_pPixelFormat getValues:&val forAttribute:NSOpenGLPFADoubleBuffer forVirtualScreen:0];
-    
+
     DEBUG_FUNC_LEAVE();
     return val == GL_TRUE ? YES : NO;
@@ -1238 +1239 @@
     m_pView = NULL;;
     [super clearDrawable];
-    
+
     DEBUG_FUNC_LEAVE();
 }
@@ -1282 +1283 @@
 
     [m_pOverlayWindow parentWindowChanged:[self window]];
-    
+
     DEBUG_FUNC_LEAVE();
 }
@@ -1310 +1311 @@
         [m_pOverlayView setOverlayWin: self];
 
-#ifdef IN_VMSVGA3D                                                                           
+#ifdef IN_VMSVGA3D
         NSRect frame = [pParentView frame];
         frame.origin.x = frame.origin.x = 0;
@@ -1368 +1369 @@
 
     [super dealloc];
-    
+
     DEBUG_FUNC_LEAVE();
 }
@@ -1377 +1378 @@
     DEBUG_MSG(("OWIN(%p): parentWindowFrameChanged\n", (void *)self));
 
-    /* 
+    /*
      * Reposition this window with the help of the OverlayView. Perform the
-     * call in the OpenGL thread. 
-     */ 
+     * call in the OpenGL thread.
+     */
     /*
     [m_pOverlayView performSelector:@selector(vboxReshapePerform) onThread:m_Thread withObject:nil waitUntilDone:YES];
@@ -1386 +1387 @@
 
     if ([m_pOverlayView isEverSized])
-    {    
+    {
         if ([NSThread isMainThread])
             [m_pOverlayView vboxReshapePerform];
@@ -1392 +1393 @@
             [self performSelectorOnMainThread:@selector(vboxReshapePerform) withObject:nil waitUntilDone:NO];
     }
-    
+
     DEBUG_FUNC_LEAVE();
 }
@@ -1415 +1416 @@
         [pWindow addChildWindow:self ordered:NSWindowAbove];
 
-        /* 
+        /*
          * Reshape the overlay view after a short waiting time to let the main
          * window resize itself properly.
@@ -1425 +1426 @@
 
         if ([m_pOverlayView isEverSized])
-        {    
+        {
             if ([NSThread isMainThread])
                 [m_pOverlayView vboxReshapePerform];
             else
                 [self performSelectorOnMainThread:@selector(vboxReshapePerform) withObject:nil waitUntilDone:NO];
-        }        
-    }
-    
+        }
+    }
+
     DEBUG_FUNC_LEAVE();
 }
@@ -1447 +1448 @@
 @implementation OverlayView
 
-- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView *)pParentView winInfo:(WindowInfo *)pWinInfo 
+- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView *)pParentView winInfo:(WindowInfo *)pWinInfo
          fVisParams:(GLbitfield) fVisParams
 {
-    COCOA_LOG_FLOW(("%s: self=%p aThread=%p pParentView=%p pWinInfo=%p fVisParams=%#x\n", __PRETTY_FUNCTION__, (void *)self, 
+    COCOA_LOG_FLOW(("%s: self=%p aThread=%p pParentView=%p pWinInfo=%p fVisParams=%#x\n", __PRETTY_FUNCTION__, (void *)self,
                     (void *)aThread, (void *)pParentView, (void *)pWinInfo, fVisParams));
 
@@ -1495 +1496 @@
 
     [self setGLCtx:nil];
-    
+
     if (m_pSharedGLCtx)
     {
@@ -1503 +1504 @@
         [m_pSharedGLCtx release];
         m_pSharedGLCtx = nil;
-        
+
 
 #ifndef IN_VMSVGA3D
@@ -1513 +1514 @@
 
     [self clearVisibleRegions];
-    
+
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
@@ -1529 +1530 @@
 - (void)drawRect:(NSRect)aRect
 {
-    COCOA_LOG_FLOW(("%s: self=%p aRect=%d,%d %d,%d\n", __PRETTY_FUNCTION__, (void *)self, (int)aRect.origin.x, (int)aRect.origin.y, 
+    COCOA_LOG_FLOW(("%s: self=%p aRect=%d,%d %d,%d\n", __PRETTY_FUNCTION__, (void *)self, (int)aRect.origin.x, (int)aRect.origin.y,
                     (int)aRect.size.width, (int)aRect.size.height));
 
@@ -1561 +1562 @@
             [pCtx retain];
     }
-        
+
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
@@ -1582 +1583 @@
 
     m_pParentView = pView;
-    
+
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
@@ -1591 +1592 @@
 
     m_pOverlayWin = pWin;
-    
+
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
@@ -1603 +1604 @@
 - (void)vboxSetPosUI:(NSPoint)pos
 {
-    COCOA_LOG_FLOW(("%s: self=%p pos=%d,%d (old pos=%d,%d)\n", __PRETTY_FUNCTION__, (void *)self, (int)pos.x, (int)pos.y, 
+    COCOA_LOG_FLOW(("%s: self=%p pos=%d,%d (old pos=%d,%d)\n", __PRETTY_FUNCTION__, (void *)self, (int)pos.x, (int)pos.y,
                     (int)m_Pos.x, (int)m_Pos.y));
 
@@ -1629 +1630 @@
 - (void)vboxSetPos:(NSPoint)pos
 {
-    COCOA_LOG_FLOW(("%s: self=%p pos=%d,%d (old pos=%d,%d)\n", __PRETTY_FUNCTION__, (void *)self, (int)pos.x, (int)pos.y, 
+    COCOA_LOG_FLOW(("%s: self=%p pos=%d,%d (old pos=%d,%d)\n", __PRETTY_FUNCTION__, (void *)self, (int)pos.x, (int)pos.y,
                     (int)m_Pos.x, (int)m_Pos.y));
 
@@ -1656 +1657 @@
     BOOL        fIsMain = [NSThread isMainThread];
     NSWindow   *pWin    = nil;
-    
+
     Assert(fIsMain);
 
@@ -1666 +1667 @@
     [pWin setContentView: nil];
     [[pWin parentWindow] removeChildWindow: pWin];
-    
+
     if (fIsMain)
         [pWin release];
@@ -1673 +1674 @@
         /* We can NOT run synchronously with the main thread since this may lead to a deadlock,
            caused by main thread waiting xpcom thread, xpcom thread waiting to main hgcm thread,
-           and main hgcm thread waiting for us, this is why use waitUntilDone:NO, 
-           which should cause no harm. */ 
+           and main hgcm thread waiting for us, this is why use waitUntilDone:NO,
+           which should cause no harm. */
         [pWin performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
     }
@@ -1686 +1687 @@
         /* We can NOT run synchronously with the main thread since this may lead to a deadlock,
            caused by main thread waiting xpcom thread, xpcom thread waiting to main hgcm thread,
-           and main hgcm thread waiting for us, this is why use waitUntilDone:NO. 
+           and main hgcm thread waiting for us, this is why use waitUntilDone:NO.
            We need to avoid concurrency though, so we cleanup some data right away via a cleanupData call. */
         [self performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
     }
-    
+
 #ifndef IN_VMSVGA3D
     renderspuWinRelease(m_pWinInfo);
 #endif
-    
+
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
@@ -1728 +1729 @@
 {
     COCOA_LOG_FLOW(("%s: self=%p size=%d,%d\n", __PRETTY_FUNCTION__, (void *)self, (int)size.width, (int)size.height));
-    
+
     VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
     NSValue *pSize = [NSValue valueWithSize:size];
@@ -1752 +1753 @@
     [self vboxBlitterSyncWindow];
 #endif
-        
+
     /* Clear background to transparent. */
     glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
@@ -1999 +2000 @@
                (int)m_Pos.x, (int)m_Pos.y, (int)m_Size.width, (int)m_Size.height));
 
-    /* @todo galitsyn: drop this!
+    /** @todo galitsyn: drop this!
      * Later we have to correct the texture position in the case the window is
-     * out of the parents window frame. So save the shift values for later use. */ 
+     * out of the parents window frame. So save the shift values for later use. */
     m_RootRect.origin.x = windowFrameSCS.origin.x - childFrameSCS.origin.x;
     m_RootRect.origin.y =  childFrameSCS.size.height + childFrameSCS.origin.y - (windowFrameSCS.size.height + windowFrameSCS.origin.y);
@@ -2022 +2023 @@
     if (m_pSharedGLCtx)
     {
-        VBOX_CR_RENDER_CTX_INFO CtxInfo; 
+        VBOX_CR_RENDER_CTX_INFO CtxInfo;
         vboxCtxEnter(m_pSharedGLCtx, &CtxInfo);
 
@@ -2073 +2074 @@
 - (void)makeCurrentFBO
 {
-    COCOA_LOG_FLOW(("%s: self=%p - m_pGLCtx=%p m_fNeedCtxUpdate=%d\n", __PRETTY_FUNCTION__, (void *)self, 
+    COCOA_LOG_FLOW(("%s: self=%p - m_pGLCtx=%p m_fNeedCtxUpdate=%d\n", __PRETTY_FUNCTION__, (void *)self,
                     (void *)m_pGLCtx, m_fNeedCtxUpdate));
 
@@ -2119 +2120 @@
             m_fNeedCtxUpdate = false;
         }
-        
+
         if (!m_FBOId)
         {
@@ -2139 +2140 @@
         return true;
     }
-        
-#ifndef IN_VMSVGA3D            
+
+#ifndef IN_VMSVGA3D
     Assert(!m_pBlitter);
     m_pBlitter = RTMemAlloc(sizeof(*m_pBlitter));
@@ -2149 +2150 @@
         return false;
     }
-        
-    int rc = CrBltInit(m_pBlitter, NULL, false /*fCreateNewCtx*/, false /*fForceDrawBlt*/, 
+
+    int rc = CrBltInit(m_pBlitter, NULL, false /*fCreateNewCtx*/, false /*fForceDrawBlt*/,
                        &render_spu.GlobalShaders, &render_spu.blitterDispatch);
     if (RT_FAILURE(rc))
@@ -2160 +2161 @@
         COCOA_LOG_FLOW(("%s: returns false - CrBltInit failed with rc=%Rrc\n", __PRETTY_FUNCTION__, rc));
         return false;
-    }        
+    }
 
     COCOA_LOG_FLOW(("%s: blitter (%p) created successfully for view 0x%p\n", (void *)m_pBlitter, (void *)self));
@@ -2168 +2169 @@
     NSOpenGLPixelFormat *pPixelFormat = [(OverlayOpenGLContext *)m_pGLCtx openGLPixelFormat];
     NSOpenGLContext     *pSharedGLCtx = [[NSOpenGLContext alloc] initWithFormat:pPixelFormat shareContext:m_pGLCtx];
-        
+
     /* Set the new context as non opaque */
     GLint opaque = 0;
@@ -2178 +2179 @@
 
     m_pSharedGLCtx = pSharedGLCtx;
-    
+
     COCOA_LOG_FLOW(("%s: returns true - new m_pSharedGLCtx=%p\n", __PRETTY_FUNCTION__, (void *)m_pSharedGLCtx));
     return true;
@@ -2188 +2189 @@
 
     glFlush();
-                  
+
     /* Issue to the gui thread. */
     [self performSelectorOnMainThread:@selector(vboxTryDrawUI) withObject:nil waitUntilDone:NO];
@@ -2198 +2199 @@
 {
     COCOA_LOG_FLOW(("%s: self=%p fVisible=%d\n", __PRETTY_FUNCTION__, (void *)self, fVisible));
-    
+
     VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
     NSNumber *pVisObj = [NSNumber numberWithBool:fVisible];
@@ -2217 +2218 @@
 - (void)vboxSetVisibleUIObj:(NSNumber *)pVisibleObj
 {
-    COCOA_LOG_FLOW(("%s: self=%p pVisibleObj=%p(%d)\n", __PRETTY_FUNCTION__, 
+    COCOA_LOG_FLOW(("%s: self=%p pVisibleObj=%p(%d)\n", __PRETTY_FUNCTION__,
                     (void *)self, (void *)pVisibleObj, [pVisibleObj boolValue]));
 
@@ -2256 +2257 @@
             [self vboxReshapeOnReparentPerform];
     }
-    
+
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
@@ -2263 +2264 @@
 {
     COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
-    
+
     if ([self isHidden])
     {
@@ -2289 +2290 @@
     }
 #endif
-    
+
     const VBOXVR_SCR_COMPOSITOR *pCompositor = NULL;
 #ifndef IN_VMSVGA3D
@@ -2319 +2320 @@
                 return;
             }
-            
+
             Assert(m_pSharedGLCtx);
-            
+
             pCompositor = renderspuVBoxCompositorAcquire(m_pWinInfo);
             Assert(!m_fDataVisible);
@@ -2341 +2342 @@
 #endif /* !IN_VMSVGA3D */
 
-    
+
     if ([self lockFocusIfCanDraw])
     {
         COCOA_LOG_FLOW(("%s: Calling vboxPresent\n", __PRETTY_FUNCTION__));
-        [self vboxPresent:pCompositor];            
+        [self vboxPresent:pCompositor];
         [self unlockFocus];
     }
@@ -2354 +2355 @@
         m_fCleanupNeeded = false;
     }
-#endif    
+#endif
     else
     {
@@ -2360 +2361 @@
         [NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(vboxTryDrawUI) userInfo:nil repeats:NO];
     }
-    
+
 #ifndef IN_VMSVGA3D
     renderspuVBoxCompositorUnlock(m_pWinInfo);
@@ -2382 +2383 @@
 #endif
 
-    VBOX_CR_RENDER_CTX_INFO CtxInfo;    
+    VBOX_CR_RENDER_CTX_INFO CtxInfo;
     vboxCtxEnter(m_pSharedGLCtx, &CtxInfo);
-    
+
     [self vboxPresentCS:pCompositor];
-    
+
     vboxCtxLeave(&CtxInfo);
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
@@ -2396 +2397 @@
     if ([m_pSharedGLCtx view] != self)
     {
-        COCOA_LOG_FLOW(("%s: Not current view of shared ctx! Switching... (self=%p, view=%p, m_pSharedGLCtx)\n", 
+        COCOA_LOG_FLOW(("%s: Not current view of shared ctx! Switching... (self=%p, view=%p, m_pSharedGLCtx)\n",
                         __PRETTY_FUNCTION__, (void *)self, (void *)[m_pSharedGLCtx view], (void *)m_pSharedGLCtx));
         [m_pSharedGLCtx setView: self];
         m_fNeedViewportUpdate = true;
     }
-    
+
     if (m_fNeedViewportUpdate)
     {
@@ -2407 +2408 @@
         m_fNeedViewportUpdate = false;
     }
-    
+
     m_fCleanupNeeded = false;
-    
+
 #ifndef IN_VMSVGA3D
     /* Render FBO content to the dock tile when necessary. */
@@ -2415 +2416 @@
 #endif
 
-    /* change to #if 0 to see thumbnail image */            
+    /* change to #if 0 to see thumbnail image */
 #if 1
     [self vboxPresentToViewCS:pCompositor];
@@ -2453 +2454 @@
 {
     NSRect r = [self frame];
-    COCOA_LOG_FLOW(("%s: self=%p - r={%d,%d %d,%d}\n", __PRETTY_FUNCTION__, (void *)self, 
+    COCOA_LOG_FLOW(("%s: self=%p - r={%d,%d %d,%d}\n", __PRETTY_FUNCTION__, (void *)self,
                     (int)r.origin.x, (int)r.origin.y, (int)r.size.width, (int)r.size.height));
 
@@ -2479 +2480 @@
     /* Clear background to transparent */
     glClear(GL_COLOR_BUFFER_BIT);
-    
+
     m_fDataVisible = false;
-    
+
 # ifndef IN_VMSVGA3D
     float xStretch;
     float yStretch;
     CrVrScrCompositorGetStretching(pCompositor, &xStretch, &yStretch);
-        
+
     VBOXVR_SCR_COMPOSITOR_CONST_ITERATOR CIter;
     const VBOXVR_SCR_COMPOSITOR_ENTRY *pEntry;
@@ -2501 +2502 @@
             rc = CrBltEnter(m_pBlitter);
             if (RT_SUCCESS(rc))
-            {                   
+            {
                 uint32_t i;
                 for (i = 0; i < cRegions; ++i)
@@ -2513 +2514 @@
                     vboxNSRectToRect(&m_RootRect, &RestrictDstRect);
                     VBoxRectIntersected(&RestrictDstRect, pDstRect, &DstRect);
-                    
+
                     if (VBoxRectIsZero(&DstRect))
                         continue;
@@ -2520 +2521 @@
 
                     vboxNSRectToRectUnstretched(&m_RootRect, &RestrictSrcRect, xStretch / backingStretchFactor, yStretch / backingStretchFactor);
-                    VBoxRectTranslate(&RestrictSrcRect, 
-                                      -CrVrScrCompositorEntryRectGet(pEntry)->xLeft, 
+                    VBoxRectTranslate(&RestrictSrcRect,
+                                      -CrVrScrCompositorEntryRectGet(pEntry)->xLeft,
                                       -CrVrScrCompositorEntryRectGet(pEntry)->yTop);
                     VBoxRectIntersected(&RestrictSrcRect, pSrcRect, &SrcRect);
-                    
+
                     if (VBoxRectIsZero(&SrcRect))
                         continue;
@@ -2530 +2531 @@
                     pSrcRect = &SrcRect;
                     pDstRect = &DstRect;
-                    
+
                     pTexData = CrVrScrCompositorEntryTexGet(pEntry);
-                    
+
                     CrBltBlitTexMural(m_pBlitter, true, CrTdTexGet(pTexData), pSrcRect, pDstRect, 1, fFlags | CRBLT_F_NOALPHA);
-                    
+
                     m_fDataVisible = true;
                 }
@@ -2577 +2578 @@
     CR_BLITTER_WINDOW   WinInfo;
     NSRect              r;
-    
+
     if (!m_pBlitter)
         return;
-        
+
     RT_ZERO(WinInfo);
-    
+
     r = [self frame];
     WinInfo.width = r.size.width;
     WinInfo.height = r.size.height;
-    
+
     Assert(WinInfo.width == m_RootRect.size.width);
     Assert(WinInfo.height == m_RootRect.size.height);
 
     /*CrBltMuralSetCurrentInfo(m_pBlitter, NULL);*/
-    
+
     CrBltMuralSetCurrentInfo(m_pBlitter, &WinInfo);
     CrBltCheckUpdateViewport(m_pBlitter);
@@ -2612 +2613 @@
     if ([m_DockTileView thumbBitmap] != nil)
     {
-        /* 
+        /*
          * Only update after at least 200 ms, cause glReadPixels is
-         * heavy performance wise. 
-         */ 
+         * heavy performance wise.
+         */
         uint64_t                                msTS = RTTimeSystemMilliTS();
         VBOXVR_SCR_COMPOSITOR_CONST_ITERATOR    CIter;
         const VBOXVR_SCR_COMPOSITOR_ENTRY      *pEntry;
-        
+
         if (msTS - m_msDockUpdateTS > 200)
         {
             m_msDockUpdateTS = msTS;
 # if 0
-            /* todo: check this for optimization */
+            /** @todo check this for optimization */
             glBindTexture(GL_TEXTURE_RECTANGLE_ARB, myTextureName);
             glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE,
@@ -2646 +2647 @@
 
             rr = [m_DockTileView frame];
-            
+
             CrVrScrCompositorGetStretching(pCompositor, &xStretch, &yStretch);
-            
+
             CrVrScrCompositorConstIterInit(pCompositor, &CIter);
             while ((pEntry = CrVrScrCompositorConstIterNext(&CIter)) != NULL)
@@ -2661 +2662 @@
                     rc = CrBltEnter(m_pBlitter);
                     if (RT_SUCCESS(rc))
-                    {                   
+                    {
                         uint32_t i;
                         for (i = 0; i < cRegions; ++i)
@@ -2670 +2671 @@
                             RTRECT   DstRect, RestrictDstRect;
                             RTRECT   SrcRect, RestrictSrcRect;
-                    
+
                             vboxNSRectToRect(&m_RootRect, &RestrictDstRect);
                             VBoxRectIntersected(&RestrictDstRect, pDstRect, &DstRect);
-                            
+
                             VBoxRectTranslate(&DstRect, -RestrictDstRect.xLeft, -RestrictDstRect.yTop);
-                            
+
                             VBoxRectScale(&DstRect, m_FBOThumbScaleX, m_FBOThumbScaleY);
-                    
+
                             if (VBoxRectIsZero(&DstRect))
                                 continue;
-                        
+
                             vboxNSRectToRectUnstretched(&m_RootRect, &RestrictSrcRect, xStretch, yStretch);
-                            VBoxRectTranslate(&RestrictSrcRect, 
-                                              -CrVrScrCompositorEntryRectGet(pEntry)->xLeft, 
+                            VBoxRectTranslate(&RestrictSrcRect,
+                                              -CrVrScrCompositorEntryRectGet(pEntry)->xLeft,
                                               -CrVrScrCompositorEntryRectGet(pEntry)->yTop);
                             VBoxRectIntersected(&RestrictSrcRect, pSrcRect, &SrcRect);
-                    
+
                             if (VBoxRectIsZero(&SrcRect))
                                 continue;
@@ -2692 +2693 @@
                             pSrcRect = &SrcRect;
                             pDstRect = &DstRect;
-                            
+
                             pTexData = CrVrScrCompositorEntryTexGet(pEntry);
-                            
+
                             CrBltBlitTexMural(m_pBlitter, true, CrTdTexGet(pTexData), pSrcRect, pDstRect, 1, fFlags);
                         }
@@ -2713 +2714 @@
                 }
             }
-            
+
             glFinish();
 
@@ -2728 +2729 @@
                          [[m_DockTileView thumbBitmap] bitmapData]);
             [m_DockTileView unlock];
-            
+
 # ifdef VBOX_WITH_CRDUMPER_THUMBNAIL
             ++g_cVBoxTgaCtr;
-            crDumpNamedTGAF((GLint)rr.size.width, (GLint)rr.size.height, 
+            crDumpNamedTGAF((GLint)rr.size.width, (GLint)rr.size.height,
                 [[m_DockTileView thumbBitmap] bitmapData], "/Users/leo/vboxdumps/dump%d.tga", g_cVBoxTgaCtr);
-# endif                
+# endif
 
             pDT = [[NSApplication sharedApplication] dockTile];
 
             /* Send a display message to the dock tile in the main thread */
-            [[[NSApplication sharedApplication] dockTile] performSelectorOnMainThread:@selector(display) withObject:nil 
+            [[[NSApplication sharedApplication] dockTile] performSelectorOnMainThread:@selector(display) withObject:nil
                                                                         waitUntilDone:NO];
         }
@@ -2762 +2763 @@
         return GL_TRUE;
     }
-    
+
     return GL_FALSE;
 }
@@ -2784 +2785 @@
         m_cClipRects  = cRects;
     }
-    
+
     COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
 }
@@ -2796 +2797 @@
     NSView *pScreenContent = nil;
 
-    /* 
+    /*
      * First try the new variant which checks if this window is within the
-     * screen which is previewed in the dock. 
-     */ 
+     * screen which is previewed in the dock.
+     */
     if ([pContentView respondsToSelector:@selector(screenContentWithParentView:)])
         pScreenContent = [pContentView performSelector:@selector(screenContentWithParentView:) withObject:(id)m_pParentView];
-    /* 
+    /*
      * If it fails, fall back to the old variant (VBox...).
      */
     else if ([pContentView respondsToSelector:@selector(screenContent)])
         pScreenContent = [pContentView performSelector:@selector(screenContent)];
-    
+
     COCOA_LOG_FLOW(("%s: returns %p (pContentView=%p)\n", __PRETTY_FUNCTION__, (void *)pScreenContent, (void *)pContentView));
     return pScreenContent;
@@ -2826 +2827 @@
         m_FBOThumbScaleX = (float)dockFrame.size.width / parentFrame.size.width;
         m_FBOThumbScaleY = (float)dockFrame.size.height / parentFrame.size.height;
-        newFrame = NSMakeRect((int)(m_Pos.x * m_FBOThumbScaleX), 
-                              (int)(dockFrame.size.height - (m_Pos.y + m_Size.height - m_yInvRootOffset) * m_FBOThumbScaleY), 
-                              (int)(m_Size.width * m_FBOThumbScaleX), 
+        newFrame = NSMakeRect((int)(m_Pos.x * m_FBOThumbScaleX),
+                              (int)(dockFrame.size.height - (m_Pos.y + m_Size.height - m_yInvRootOffset) * m_FBOThumbScaleY),
+                              (int)(m_Size.width * m_FBOThumbScaleX),
                               (int)(m_Size.height * m_FBOThumbScaleY));
         /*
@@ -2837 +2838 @@
         [m_DockTileView setFrame: newFrame];
     }
-    COCOA_LOG_FLOW(("%s: returns - newFrame={%d,%d %d,%d} pView=%d\n", __PRETTY_FUNCTION__,  (int)newFrame.origin.x, 
+    COCOA_LOG_FLOW(("%s: returns - newFrame={%d,%d %d,%d} pView=%d\n", __PRETTY_FUNCTION__,  (int)newFrame.origin.x,
                     (int)newFrame.origin.y, (int)newFrame.size.width, (int)newFrame.size.height, (void *)pView));
 }
@@ -2902 +2903 @@
 
     /* Create our worker view. */
-    OverlayView *pView = [[OverlayView alloc] initWithFrame:NSZeroRect 
-                                                     thread:RTThreadSelf() 
-                                                 parentView:pParentView 
+    OverlayView *pView = [[OverlayView alloc] initWithFrame:NSZeroRect
+                                                     thread:RTThreadSelf()
+                                                 parentView:pParentView
                                                     winInfo:pWinInfo
                                                  fVisParams:fVisParams];
@@ -2916 +2917 @@
         return pView;
     }
-    
+
     COCOA_LOG_FLOW(("vboxViewCreate: returns NULL\n"));
     return NULL;
@@ -2943 +2944 @@
 void cocoaViewCreate(NativeNSViewRef *ppView, WindowInfo *pWinInfo, NativeNSViewRef pParentView, GLbitfield fVisParams)
 {
-    COCOA_LOG_FLOW(("cocoaViewCreate: ppView=%p pWinInfo=%p pParentView=%p fVisParams=%#x\n", 
+    COCOA_LOG_FLOW(("cocoaViewCreate: ppView=%p pWinInfo=%p pParentView=%p fVisParams=%#x\n",
                     (void *)ppView, (void *)pWinInfo, (void *)pParentView, fVisParams));
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
@@ -2950 +2951 @@
     VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
     [pRunner runTasksSyncIfPossible];
-    
+
 #ifndef IN_VMSVGA3D
     renderspuWinRetain(pWinInfo);
@@ -2976 +2977 @@
 #endif
     }
-    
+
 #ifndef IN_VMSVGA3D
     if (!*ppView)
         renderspuWinRelease(pWinInfo);
 #endif
-    
+
     [pPool release];
     COCOA_LOG_FLOW(("cocoaViewCreate: returns *ppView=%p\n", (void *)*ppView));
@@ -3076 +3077 @@
     CR_RCD_GETGEOMETRY *pGetGeometry = (CR_RCD_GETGEOMETRY *)pvUser;
     pGetGeometry->rect = [[pGetGeometry->pView window] frame];
-    COCOA_LOG_FLOW(("vboxRcdGetGeomerty: (x,y)=(%d,%d) (cx,cy)=(%d,%d)\n", pGetGeometry->rect.origin.x, pGetGeometry->rect.origin.y, 
+    COCOA_LOG_FLOW(("vboxRcdGetGeomerty: (x,y)=(%d,%d) (cx,cy)=(%d,%d)\n", pGetGeometry->rect.origin.x, pGetGeometry->rect.origin.y,
                     pGetGeometry->rect.size.width, pGetGeometry->rect.size.height));
 }
@@ -3082 +3083 @@
 void cocoaViewGetGeometry(NativeNSViewRef pView, int *px, int *py, int *pcx, int *pcy)
 {
-    COCOA_LOG_FLOW(("cocoaViewGetGeometry: pView=%p px=%p py=%p pcx=%p pcy=%p\n", 
+    COCOA_LOG_FLOW(("cocoaViewGetGeometry: pView=%p px=%p py=%p pcx=%p pcy=%p\n",
                     (void *)pView, (void *)px, (void *)py, (void *)pcx, (void *)pcy));
     NSAutoreleasePool *pPool;
@@ -3090 +3091 @@
     VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
     [pRunner runTasksSyncIfPossible];
-    
+
     NSRect frame;
 #ifndef IN_VMSVGA3D
@@ -3106 +3107 @@
         frame = [[pView window] frame];
     }
-    
+
     *px  = frame.origin.x;
     *py  = frame.origin.y;
@@ -3134 +3135 @@
         {
             DEBUG_WARN(("renderspuDefaultSharedContextAcquire returned NULL"));
-            
+
             [pPool release];
             DEBUG_FUNC_LEAVE();
             return;
         }
-        
+
         pCtx = pCtxInfo->context;
-        
+
         [(OverlayView *)pView setGLCtx:pCtx];
     }
 # endif
-    
+
     [(OverlayView *)pView presentComposition:pChangedEntry];
 
@@ -3176 +3177 @@
         }
 #endif
-        [NSOpenGLContext clearCurrentContext];
+        [NSOpenGLContext clearCurrentContext];
     }
 
@@ -3272 +3273 @@
     DEBUG_FUNC_ENTER();
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
-    
+
     Assert([(OverlayView *)pView glCtx] == pCtx);
     Assert([pCtx view] == pView);

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

@@ -243 +243 @@
     if (pcpwSetting)
     {
-        /* TODO: need proper blitter synchronization, do not use so far!
+        /** @todo need proper blitter synchronization, do not use so far!
          * the problem is that rendering can be done in multiple thread: the main command (hgcm) thread and the redraw thread
          * we currently use per-window synchronization, while we'll need a per-blitter synchronization if one blitter is used for multiple windows

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

@@ -1391 +1391 @@
              */
 
-            /*@todo Chromium has no correct code to remove window ids and associated info from 
+            /** @todo Chromium has no correct code to remove window ids and associated info from 
              * various tables. This is hack which just hides the root case.
              */