VirtualBox

Ignore:
Timestamp:
Dec 22, 2014 12:13:45 PM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
97364
Message:

Preps for replacing DevVGA-SVGA3d-cocoa.m with renderspu_cocoa_helper.m, i.e. sharing the objective-C OpenGL wrappers between the two 3D solutions.

Location:
trunk/src/VBox/HostServices/SharedOpenGL/render
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r53556 r53601  
    2222#include <VBox/VBoxCocoa.h>
    2323#include <OpenGL/OpenGL.h>
    24 #include <cr_vreg.h>
    25 #include <cr_compositor.h>
     24#ifdef IN_VMSVGA3D
     25# include "../../../GuestHost/OpenGL/include/cr_vreg.h"
     26# include "../../../GuestHost/OpenGL/include/cr_compositor.h"
     27#else
     28# include <cr_vreg.h>
     29# include <cr_compositor.h>
     30#endif
    2631
    2732

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

    r53594 r53601  
    11/* $Id$ */
    22/** @file
    3  * VirtualBox OpenGL Cocoa Window System Helper Implementation.
     3 * VirtualBox OpenGL Cocoa Window System Helper Implementation.
     4 * 
     5 * This source file is shared between the SharedOpenGL HGCM service and the
     6 * SVGA3d emulation.
    47 */
    58
    … …  
    5962 *   this is our own one, before use. Really neat concept of Objective-C/Cocoa
    6063 *   ;)
     64 *
    6165 */
    6266
    … …  
    6468*   Header Files                                                               *
    6569*******************************************************************************/
     70#ifdef IN_VMSVGA3D
     71# define LOG_GROUP LOG_GROUP_DEV_VMSVGA
     72#endif
    6673#include "renderspu_cocoa_helper.h"
    6774
    … …  
    6976#undef PVM /* sys/param.h (included via Cocoa.h) pollutes the namespace with this define. */
    7077
    71 #include "chromium.h" /* For the visual bits of chromium */
    72 
     78#ifndef IN_VMSVGA3D
     79# include "chromium.h" /* For the visual bits of chromium */
     80#endif
     81
     82#include <iprt/assert.h>
     83#include <iprt/critsect.h>
     84#include <iprt/mem.h>
     85#include <iprt/string.h>
     86#include <iprt/time.h>
    7387#include <iprt/thread.h>
    74 #include <iprt/string.h>
    75 #include <iprt/mem.h>
    76 #include <iprt/time.h>
    77 #include <iprt/assert.h>
     88
    7889#include <VBox/VBoxOGLTest.h>
    79 
    80 #include <cr_vreg.h>
    81 #include <cr_error.h>
    82 #include <cr_blitter.h>
    83 #ifdef VBOX_WITH_CRDUMPER_THUMBNAIL
    84 # include <cr_pixeldata.h>
    85 #endif
    86 
    87 
    88 #include "renderspu.h"
     90#include <VBox/log.h>
     91
     92#ifdef IN_VMSVGA3D
     93# include "DevVGA-SVGA3d-cocoa.h"
     94#else
     95# include <cr_vreg.h>
     96# include <cr_error.h>
     97# include <cr_blitter.h>
     98# ifdef VBOX_WITH_CRDUMPER_THUMBNAIL
     99#  include <cr_pixeldata.h>
     100# endif
     101# include "renderspu.h"
     102#endif
     103
    89104
    90105
    … …  
    110125#ifdef DEBUG_VERBOSE
    111126# error "should be disabled!"
    112 # define DEBUG_INFO(text) do { \
    113         crWarning text ; \
    114         AssertFailed(); \
    115     } while (0)
    116 
    117 # define DEBUG_WARN(text) do { \
    118         crWarning text ; \
    119         AssertFailed(); \
    120     } while (0)
     127# ifdef IN_VMSVGA3D
     128#  define DEBUG_INFO(text) do { LogRel(text); AssertFailed(); } while (0)
     129#  define DEBUG_WARN(text) do { LogRel(text); AssertFailed(); } while (0)
     130# else
     131#  define DEBUG_INFO(text) do { crWarning text; AssertFailed(); } while (0)
     132#  define DEBUG_WARN(text) do { crWarning text; AssertFailed(); } while (0)
     133# endif
    121134
    122135# define DEBUG_MSG(text)   do { printf text; } while (0)
    … …  
    125138#else
    126139
    127 # define DEBUG_INFO(text) do { \
    128         crInfo text ; \
    129     } while (0)
    130 
    131 # define DEBUG_WARN(text) do { \
    132         crWarning text ; \
    133     } while (0)
    134 
     140# ifdef IN_VMSVGA3D
     141#  define DEBUG_INFO(text) do { LogRel(text); } while (0)
     142#  define DEBUG_WARN(text) do { LogRel(text); } while (0)
     143# else
     144#  define DEBUG_INFO(text) do { crInfo text; } while (0)
     145#  define DEBUG_WARN(text) do { crWarning text; } while (0)
     146#endif
    135147# define DEBUG_MSG(text)   do {} while (0)
    136148# define DEBUG_MSG_1(text) do {} while (0)
    137149
     150#endif
     151#ifdef IN_VMSVGA3D
     152# define DEBUG_MSG_NOT_VMSVGA3D(a_TextArgs)     do {} while (0)
     153# define COCOA_LOG_FLOW(a_TextArgs)             LogFlow(a_TextArgs)
     154#else
     155# define DEBUG_MSG_NOT_VMSVGA3D(a_TextArgs)     DEBUG_MSG(a_TextArgs)
     156# define COCOA_LOG_FLOW(a_TextArgs)             DEBUG_MSG(a_TextArgs)
    138157#endif
    139158
    … …  
    197216
    198217
     218#ifdef IN_VMSVGA3D
     219
     220/*
     221 * VMSVGA3D compatability glue.
     222 */
     223
     224# define CR_RGB_BIT             RT_BIT_32(0)
     225
     226# define CR_ALPHA_BIT           RT_BIT_32(1)
     227# define CR_DEPTH_BIT           RT_BIT_32(2)
     228# define CR_STENCIL_BIT         RT_BIT_32(3)
     229# define CR_ACCUM_BIT           RT_BIT_32(4)
     230# define CR_DOUBLE_BIT          RT_BIT_32(5)
     231# define CR_STEREO_BIT          RT_BIT_32(6)
     232# define CR_MULTISAMPLE_BIT     RT_BIT_32(7)
     233
     234# define CR_OVERLAY_BIT         RT_BIT_32(8)
     235# define CR_PBUFFER_BIT         RT_BIT_32(9)
     236# define CR_ALL_BITS            UINT32_C(0x000003ff)
     237
     238typedef struct WindowInfo
     239{
     240    uint32_t volatile           cRefs;
     241    RTCRITSECT                  CompositorLock;
     242    PCVBOXVR_SCR_COMPOSITOR     pCompositor;
     243
     244    //NativeNSViewRef window;
     245    //NativeNSViewRef nativeWindow; /**< for render_to_app_window */
     246    NativeNSOpenGLContextRef   *currentCtx;
     247} WindowInfo;
     248
     249static void vmsvga3DWinInfoDestroy(WindowInfo *pWinInfo)
     250{
     251    /** @todo */
     252}
     253
     254DECLINLINE(void) renderspuWinRetain(WindowInfo *pWinInfo)
     255{
     256    ASMAtomicIncU32(&pWinInfo->cRefs);
     257}
     258
     259DECLINLINE(void) renderspuWinRelease(WindowInfo *pWinInfo)
     260{
     261    uint32_t cRefs = ASMAtomicDecU32(&pWinInfo->cRefs);
     262    if (!cRefs)
     263        vmsvga3DWinInfoDestroy(pWinInfo);
     264}     
     265
     266static int renderspuVBoxCompositorLock(WindowInfo *pWinInfo, PCVBOXVR_SCR_COMPOSITOR *ppCompositor)
     267{
     268    int rc = RTCritSectEnter(&pWinInfo->CompositorLock);
     269    AssertRCReturn(rc, rc);
     270    if (ppCompositor)
     271        *ppCompositor = pWinInfo->pCompositor;
     272    return VINF_SUCCESS;
     273}
     274
     275static int renderspuVBoxCompositorUnlock(WindowInfo *pWinInfo)
     276{
     277    int rc = RTCritSectLeave(&pWinInfo->CompositorLock);
     278    AssertRC(rc);
     279    return rc;
     280}
     281
     282static PCVBOXVR_SCR_COMPOSITOR renderspuVBoxCompositorAcquire(WindowInfo *pWinInfo)
     283{
     284    int rc = RTCritSectEnter(&pWinInfo->CompositorLock);
     285    AssertRCReturn(rc, NULL);
     286
     287    PCVBOXVR_SCR_COMPOSITOR pCompositor = pWinInfo->pCompositor;
     288    if (pCompositor)
     289    {
     290        Assert(!CrVrScrCompositorIsEmpty(pWinInfo->pCompositor));
     291        return pCompositor;
     292    }
     293
     294    /* if no compositor is set, release the lock and return */
     295    RTCritSectLeave(&pWinInfo->CompositorLock);
     296    return NULL;
     297}
     298
     299static void renderspuVBoxCompositorRelease(WindowInfo *pWinInfo)
     300{
     301    Assert(pWinInfo->pCompositor);
     302    Assert(!CrVrScrCompositorIsEmpty(pWinInfo->pCompositor));
     303    int rc = RTCritSectLeave(&pWinInfo->CompositorLock);
     304    AssertRC(rc);
     305}
     306
     307
     308#endif
     309
     310
    199311
    200312static NSOpenGLContext *vboxCtxGetCurrent(void)
    201313{
     314#ifdef IN_VMSVGA3D
     315#else
    202316    GET_CONTEXT(pCtxInfo);
    203317    if (pCtxInfo)
    … …  
    206320        return pCtxInfo->context;
    207321    }
     322#endif
    208323
    209324    return nil;
    … …  
    212327static bool vboxCtxSyncCurrentInfo(void)
    213328{
     329    bool fAdjusted = false;
     330#ifdef IN_VMSVGA3D
     331#else
    214332    GET_CONTEXT(pCtxInfo);
    215333    NSOpenGLContext *pCtx = [NSOpenGLContext currentContext];
    216334    NSView *pView = pCtx ? [pCtx view] : nil;
    217     bool fAdjusted = false;
    218335    if (pCtxInfo)
    219336    {
    … …  
    232349        fAdjusted = true;
    233350    }
     351#endif
    234352   
    235353    return fAdjusted;
    … …  
    651769- (bool)runTasksSyncIfPossible
    652770{
     771#ifndef IN_VMSVGA3D
    653772    /*
    654773     * Call on main thread (?) via renderspuCalloutClient (whatever that is).
    … …  
    660779        return true;
    661780    }
     781#endif
    662782   
    663783    /*
    … …  
    720840
    721841    /** @name For clipping
    722      *  @{ */
     842     * @remarks appears to be unused and a complete waste of time + heap.
     843     * @{ */
    723844    GLint               m_cClipRects;
    724845    GLint              *m_paClipRects;
    … …  
    12701391- (id)initWithFrame:(NSRect)frame thread:(RTTHREAD)aThread parentView:(NSView *)pParentView winInfo:(WindowInfo *)pWinInfo
    12711392{
    1272     DEBUG_FUNC_ENTER();
     1393    COCOA_LOG_FLOW(("%s: self=%p aThread=%p pParentView=%p pWinInfo=%p\n", __PRETTY_FUNCTION__, (void *)self,
     1394                    (void *)aThread, (void *)pParentView, (void *)pWinInfo));
    12731395
    12741396    m_pParentView             = pParentView;
    … …  
    12941416    self = [super initWithFrame:frame];
    12951417
    1296     DEBUG_MSG(("OVIW(%p): init OverlayView\n", (void *)self));
    1297     DEBUG_FUNC_LEAVE();
     1418    COCOA_LOG_FLOW(("%s: returns self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    12981419    return self;
    12991420}
    … …  
    13011422- (void)cleanupData
    13021423{
    1303     DEBUG_FUNC_ENTER();
     1424    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    13041425
    13051426    [self deleteDockTile];
    … …  
    13221443    [self clearVisibleRegions];
    13231444   
    1324     DEBUG_FUNC_LEAVE();
     1445    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    13251446}
    13261447
    13271448- (void)dealloc
    13281449{
    1329     DEBUG_FUNC_ENTER();
    1330     DEBUG_MSG(("OVIW(%p): dealloc OverlayView\n", (void *)self));
     1450    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    13311451
    13321452    [self cleanupData];
    13331453    [super dealloc];
    13341454
    1335     DEBUG_FUNC_LEAVE();
     1455    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    13361456}
    13371457
    13381458- (void)drawRect:(NSRect)aRect
    13391459{
     1460    COCOA_LOG_FLOW(("%s: self=%p aRect=%d,%d %d,%d\n", __PRETTY_FUNCTION__, (void *)self, (int)aRect.origin.x, (int)aRect.origin.y,
     1461                    (int)aRect.size.width, (int)aRect.size.height));
     1462
    13401463    [self vboxTryDrawUI];
     1464
     1465    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    13411466}
    13421467
    13431468- (void)setGLCtx:(NSOpenGLContext *)pCtx
    13441469{
    1345     DEBUG_FUNC_ENTER();
    1346     DEBUG_MSG(("OVIW(%p): setGLCtx: new ctx: %p\n", (void *)self, (void *)pCtx));
     1470    COCOA_LOG_FLOW(("%s: self=%p pCtx=%p (old=%p)\n", __PRETTY_FUNCTION__, (void *)self, (void *)pCtx, m_pGLCtx));
    13471471
    13481472    /*
    … …  
    13641488    }
    13651489       
    1366     DEBUG_FUNC_LEAVE();
     1490    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    13671491}
    13681492
    13691493- (NSOpenGLContext *)glCtx
    13701494{
    1371     DEBUG_FUNC_ENTER();
    1372     DEBUG_FUNC_LEAVE();
     1495    COCOA_LOG_FLOW(("%s: self=%p returns %p\n", __PRETTY_FUNCTION__, (void *)self, (void *)m_pGLCtx));
    13731496    return m_pGLCtx;
    13741497}
    … …  
    13761499- (NSView *)parentView
    13771500{
    1378     DEBUG_FUNC_ENTER();
    1379     DEBUG_FUNC_LEAVE();
     1501    COCOA_LOG_FLOW(("%s: self=%p returns %p\n", __PRETTY_FUNCTION__, (void *)self, (void *)m_pParentView));
    13801502    return m_pParentView;
    13811503}
    … …  
    13831505- (void)setParentView:(NSView *)pView
    13841506{
    1385     DEBUG_FUNC_ENTER();
    1386     DEBUG_MSG(("OVIW(%p): setParentView: new view: %p\n", (void *)self, (void *)pView));
     1507    COCOA_LOG_FLOW(("%s: self=%p pView=%p (old=%p)\n", __PRETTY_FUNCTION__, (void *)self, (void *)pView, m_pParentView));
    13871508
    13881509    m_pParentView = pView;
    13891510   
    1390     DEBUG_FUNC_LEAVE();
     1511    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    13911512}
    13921513
    13931514- (void)setOverlayWin:(NSWindow *)pWin
    13941515{
    1395     DEBUG_FUNC_ENTER();
    1396     DEBUG_MSG(("OVIW(%p): setOverlayWin: new win: %p\n", (void *)self, (void *)pWin));
     1516    COCOA_LOG_FLOW(("%s: self=%p pWin=%p (old=%p)\n", __PRETTY_FUNCTION__, (void *)self, (void *)pWin, m_pOverlayWin));
    13971517
    13981518    m_pOverlayWin = pWin;
    13991519   
    1400     DEBUG_FUNC_LEAVE();
     1520    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    14011521}
    14021522
    14031523- (NSWindow *)overlayWin
    14041524{
    1405     DEBUG_FUNC_ENTER();
    1406     DEBUG_FUNC_LEAVE();
     1525    COCOA_LOG_FLOW(("%s: self=%p returns %p\n", __PRETTY_FUNCTION__, (void *)self, (void *)m_pOverlayWin));
    14071526    return m_pOverlayWin;
    14081527}
    … …  
    14101529- (void)vboxSetPosUI:(NSPoint)pos
    14111530{
    1412     DEBUG_FUNC_ENTER();
     1531    COCOA_LOG_FLOW(("%s: self=%p pos=%d,%d (old pos=%d,%d)\n", __PRETTY_FUNCTION__, (void *)self, (int)pos.x, (int)pos.y,
     1532                    (int)m_Pos.x, (int)m_Pos.y));
    14131533
    14141534    m_Pos = pos;
    … …  
    14171537        [self vboxReshapePerform];
    14181538       
    1419     DEBUG_FUNC_LEAVE();
     1539    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    14201540}
    14211541
    14221542- (void)vboxSetPosUIObj:(NSValue *)pPos
    14231543{
    1424     DEBUG_FUNC_ENTER();
     1544    COCOA_LOG_FLOW(("%s: self=%p pPos=%p (%d,%d) (old pos=%d,%d)\n", __PRETTY_FUNCTION__, (void *)self, pPos,
     1545                    (int)[pPos pointValue].x, (int)[pPos pointValue].y, (int)m_Pos.x, (int)m_Pos.y));
    14251546
    14261547    NSPoint pos = [pPos pointValue];
    14271548    [self vboxSetPosUI:pos];
    14281549
    1429     DEBUG_FUNC_LEAVE();
     1550    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    14301551}
    14311552
    14321553- (void)vboxSetPos:(NSPoint)pos
    14331554{
    1434     DEBUG_FUNC_ENTER();
    1435 
    1436     DEBUG_MSG(("OVIW(%p): vboxSetPos: new pos: %d, %d\n", (void *)self, (int)pos.x, (int)pos.y));
     1555    COCOA_LOG_FLOW(("%s: self=%p pos=%d,%d (old pos=%d,%d)\n", __PRETTY_FUNCTION__, (void *)self, (int)pos.x, (int)pos.y,
     1556                    (int)m_Pos.x, (int)m_Pos.y));
     1557
    14371558    VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
    14381559    NSValue *pPos =  [NSValue valueWithPoint:pos];
    14391560    [pRunner addObj:self selector:@selector(vboxSetPosUIObj:) arg:pPos];
    14401561
    1441     DEBUG_FUNC_LEAVE();
     1562    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    14421563}
    14431564
    14441565- (NSPoint)pos
    14451566{
    1446     DEBUG_FUNC_ENTER();
    1447     DEBUG_FUNC_LEAVE();
     1567    COCOA_LOG_FLOW(("%s: self=%p returns %d,%d\n", __PRETTY_FUNCTION__, (void *)self, (int)m_Pos.x, (int)m_Pos.y));
    14481568    return m_Pos;
    14491569}
    … …  
    14511571- (bool)isEverSized
    14521572{
    1453     DEBUG_FUNC_ENTER();
    1454     DEBUG_FUNC_LEAVE();
     1573    COCOA_LOG_FLOW(("%s: self=%p returns %d\n", __PRETTY_FUNCTION__, (void *)self, m_fEverSized));
    14551574    return m_fEverSized;
    14561575}
    … …  
    14581577- (void)vboxDestroy
    14591578{
    1460     DEBUG_FUNC_ENTER();
     1579    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    14611580    BOOL        fIsMain = [NSThread isMainThread];
    14621581    NSWindow   *pWin    = nil;
    … …  
    14981617    renderspuWinRelease(m_pWinInfo);
    14991618   
    1500     DEBUG_FUNC_LEAVE();
     1619    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    15011620}
    15021621
    15031622- (void)vboxSetSizeUIObj:(NSValue *)pSize
    15041623{
    1505     DEBUG_FUNC_ENTER();
     1624    COCOA_LOG_FLOW(("%s: self=%p pSize=%p (%d,%d)\n", __PRETTY_FUNCTION__, (void *)self, (void *)pSize,
     1625                    (int)[pSize sizeValue].width, (int)[pSize sizeValue].height));
     1626
    15061627    NSSize size = [pSize sizeValue];
    15071628    [self vboxSetSizeUI:size];
    1508     DEBUG_FUNC_LEAVE();
     1629
     1630    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    15091631}
    15101632
    15111633- (void)vboxSetSizeUI:(NSSize)size
    15121634{
    1513     DEBUG_FUNC_ENTER();
     1635    COCOA_LOG_FLOW(("%s: self=%p size=%d,%d\n", __PRETTY_FUNCTION__, (void *)self, (int)size.width, (int)size.height));
    15141636
    15151637    m_Size = size;
    … …  
    15221644    [self vboxTryDrawUI];
    15231645
    1524     DEBUG_FUNC_LEAVE();
     1646    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    15251647}
    15261648
    15271649- (void)vboxSetSize:(NSSize)size
    15281650{
    1529     DEBUG_FUNC_ENTER();
     1651    COCOA_LOG_FLOW(("%s: self=%p size=%d,%d\n", __PRETTY_FUNCTION__, (void *)self, (int)size.width, (int)size.height));
    15301652   
    15311653    VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
    … …  
    15331655    [pRunner addObj:self selector:@selector(vboxSetSizeUIObj:) arg:pSize];
    15341656
    1535     DEBUG_FUNC_LEAVE();
     1657    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    15361658}
    15371659
    15381660- (NSSize)size
    15391661{
    1540     DEBUG_FUNC_ENTER();
    1541     DEBUG_FUNC_LEAVE();
     1662    COCOA_LOG_FLOW(("%s: self=%p returns %d,%d\n", __PRETTY_FUNCTION__, (void *)self, (int)m_Size.width, (int)m_Size.height));
    15421663    return m_Size;
    15431664}
    … …  
    15451666- (void)updateViewportCS
    15461667{
    1547     DEBUG_FUNC_ENTER();
    1548     DEBUG_MSG(("OVIW(%p): updateViewport\n", (void *)self));
     1668    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    15491669
    15501670    /* Update the viewport for our OpenGL view. */
    … …  
    15551675    /* Clear background to transparent. */
    15561676    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
    1557     DEBUG_FUNC_LEAVE();
     1677
     1678    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    15581679}
    15591680
    15601681- (void)vboxReshapeOnResizePerform
    15611682{
    1562     DEBUG_FUNC_ENTER();
     1683    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    15631684   
    15641685    [self vboxReshapePerform];
    … …  
    15811702#endif
    15821703
    1583     DEBUG_FUNC_LEAVE();
     1704    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    15841705}
    15851706
    15861707- (void)vboxReshapeOnReparentPerform
    15871708{
    1588     DEBUG_FUNC_ENTER();
     1709    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    15891710    [self createDockTile];
    1590     DEBUG_FUNC_LEAVE();
     1711    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    15911712}
    15921713
    15931714- (void)vboxReshapePerform
    15941715{
    1595     DEBUG_FUNC_ENTER();
     1716    COCOA_LOG_FLOW(("%s: self=%p - m_DockTileView=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)m_DockTileView));
    15961717    NSRect parentFrame = NSZeroRect;
    15971718    NSPoint parentPos  = NSZeroPoint;
    … …  
    15991720    NSRect childFrame  = NSZeroRect;
    16001721    NSRect newFrame    = NSZeroRect;
    1601 
    1602     DEBUG_MSG(("OVIW(%p): vboxReshapePerform\n", (void *)self));
    16031722   
    16041723    parentFrame = [m_pParentView frame];
    … …  
    16781797    }
    16791798
    1680     DEBUG_FUNC_LEAVE();
     1799    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    16811800}
    16821801
    16831802- (void)createDockTile
    16841803{
    1685     DEBUG_FUNC_ENTER();
     1804    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    16861805    NSView *pDockScreen = nil;
    16871806
    … …  
    16981817    }
    16991818
    1700     DEBUG_FUNC_LEAVE();
     1819    COCOA_LOG_FLOW(("%s: returns - m_DockTileView\n", __PRETTY_FUNCTION__, (void *)m_DockTileView));
    17011820}
    17021821
    17031822- (void)deleteDockTile
    17041823{
    1705     DEBUG_FUNC_ENTER();
     1824    COCOA_LOG_FLOW(("%s: self=%p - m_DockTileView=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)m_DockTileView));
     1825
    17061826    if (m_DockTileView != nil)
    17071827    {
    … …  
    17101830        m_DockTileView = nil;
    17111831    }
    1712     DEBUG_FUNC_LEAVE();
     1832
     1833    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    17131834}
    17141835
    17151836- (void)makeCurrentFBO
    17161837{
    1717     DEBUG_MSG(("OVIW(%p): makeCurrentFBO\n", (void *)self));
     1838    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    17181839
    17191840    if (m_pGLCtx)
    … …  
    17271848            DEBUG_CHECK_GL_ERROR();
    17281849        }
     1850
    17291851        /*
    17301852        if ([NSOpenGLContext currentContext] != m_pGLCtx)
    … …  
    17461868        }
    17471869    }
     1870
     1871    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    17481872}
    17491873
    17501874- (bool)vboxSharedCtxCreate
    17511875{
    1752     DEBUG_FUNC_ENTER();
    1753     GLint                   opaque = 0;
    1754     NSOpenGLContext        *pSharedGLCtx;
    1755     NSOpenGLPixelFormat    *pPixelFormat;
     1876    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    17561877
    17571878    if (m_pSharedGLCtx)
    17581879    {
    1759         DEBUG_FUNC_LEAVE();
     1880        COCOA_LOG_FLOW(("%s: returns true (m_pSharedGLCtx=%p)\n", __PRETTY_FUNCTION__, (void *)m_pSharedGLCtx));
    17601881        return true;
    17611882    }
    17621883       
    17631884    Assert(!m_pBlitter);
    1764     m_pBlitter = RTMemAlloc(sizeof (*m_pBlitter));
     1885    m_pBlitter = RTMemAlloc(sizeof(*m_pBlitter));
    17651886    if (RT_UNLIKELY(!m_pBlitter))
    17661887    {
    17671888        DEBUG_WARN(("m_pBlitter allocation failed"));
    1768         DEBUG_FUNC_LEAVE();
     1889        COCOA_LOG_FLOW(("%s: returns false - m_pBlitter allocation failed\n", __PRETTY_FUNCTION__));
    17691890        return false;
    17701891    }
    17711892       
    1772     int rc = CrBltInit(m_pBlitter, NULL, false, false, &render_spu.GlobalShaders, &render_spu.blitterDispatch);
     1893    int rc = CrBltInit(m_pBlitter, NULL, false /*fCreateNewCtx*/, false /*fForceDrawBlt*/,
     1894#ifdef IN_VMSVGA3D
     1895                       NULL /** @todo */, NULL /** @todo */
     1896#else
     1897                       &render_spu.GlobalShaders, &render_spu.blitterDispatch
     1898#endif
     1899                       );
    17731900    if (RT_FAILURE(rc))
    17741901    {
    … …  
    17761903        RTMemFree(m_pBlitter);
    17771904        m_pBlitter = NULL;
    1778         DEBUG_FUNC_LEAVE();
     1905
     1906        COCOA_LOG_FLOW(("%s: returns false - CrBltInit failed with rc=%Rrc\n", __PRETTY_FUNCTION__, rc));
    17791907        return false;
    17801908    }       
    17811909
    1782     DEBUG_MSG(("blitter created successfully for view 0x%p\n", (void *)self));
     1910    COCOA_LOG_FLOW(("%s: blitter (%p) created successfully for view 0x%p\n", (void *)m_pBlitter, (void *)self));
    17831911
    17841912    /* Create a shared context out of the main context. Use the same pixel format. */
    1785     pPixelFormat = [(OverlayOpenGLContext *)m_pGLCtx openGLPixelFormat];
    1786     pSharedGLCtx = [[NSOpenGLContext alloc] initWithFormat:pPixelFormat shareContext:m_pGLCtx];
     1913    NSOpenGLPixelFormat *pPixelFormat = [(OverlayOpenGLContext *)m_pGLCtx openGLPixelFormat];
     1914    NSOpenGLContext     *pSharedGLCtx = [[NSOpenGLContext alloc] initWithFormat:pPixelFormat shareContext:m_pGLCtx];
    17871915       
    17881916    /* Set the new context as non opaque */
     1917    GLint opaque = 0;
    17891918    [pSharedGLCtx setValues:&opaque forParameter:NSOpenGLCPSurfaceOpacity];
    17901919
    … …  
    17951924    m_pSharedGLCtx = pSharedGLCtx;
    17961925   
    1797     DEBUG_FUNC_LEAVE();
     1926    COCOA_LOG_FLOW(("%s: returns true - new m_pSharedGLCtx=%p\n", __PRETTY_FUNCTION__, (void *)m_pSharedGLCtx));
    17981927    return true;
    17991928}
    … …  
    18011930- (void)vboxTryDraw
    18021931{
     1932    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
     1933
    18031934    glFlush();
    18041935                 
    18051936    /* Issue to the gui thread. */
    1806     DEBUG_MSG(("My[%p]: Draw\n", self));     
    18071937    [self performSelectorOnMainThread:@selector(vboxTryDrawUI) withObject:nil waitUntilDone:NO];
     1938
     1939    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    18081940}
    18091941
    18101942- (void)vboxSetVisible:(GLboolean)fVisible
    18111943{
    1812     DEBUG_FUNC_ENTER();
     1944    COCOA_LOG_FLOW(("%s: self=%p fVisible=%d\n", __PRETTY_FUNCTION__, (void *)self, fVisible));
    18131945   
    18141946    VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
    1815     NSNumber* pVisObj = [NSNumber numberWithBool:fVisible];
     1947    NSNumber *pVisObj = [NSNumber numberWithBool:fVisible];
    18161948    [pRunner addObj:self selector:@selector(vboxSetVisibleUIObj:) arg:pVisObj];
    18171949
    1818     DEBUG_FUNC_LEAVE();
     1950    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    18191951}
    18201952
    18211953- (void)vboxSetVisibleUI:(GLboolean)fVisible
    18221954{
    1823     DEBUG_FUNC_ENTER();
     1955    COCOA_LOG_FLOW(("%s: self=%p fVisible=%d\n", __PRETTY_FUNCTION__, (void *)self, fVisible));
     1956
    18241957    [self setHidden: !fVisible];
    1825     DEBUG_FUNC_LEAVE();
    1826 }
    1827 
    1828 - (void)vboxSetVisibleUIObj:(NSNumber*)pVisible
    1829 {
    1830     DEBUG_FUNC_ENTER();
    1831     BOOL fVisible = [pVisible boolValue];
     1958
     1959    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
     1960}
     1961
     1962- (void)vboxSetVisibleUIObj:(NSNumber *)pVisibleObj
     1963{
     1964    COCOA_LOG_FLOW(("%s: self=%p pVisibleObj=%p(%d)\n", __PRETTY_FUNCTION__,
     1965                    (void *)self, (void *)pVisibleObj, [pVisibleObj boolValue]));
     1966
     1967    BOOL fVisible = [pVisibleObj boolValue];
    18321968    [self vboxSetVisibleUI:fVisible];
    1833     DEBUG_FUNC_LEAVE();
     1969
     1970    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    18341971}
    18351972
    18361973- (void)vboxReparent:(NSView *)pParentView
    18371974{
    1838     DEBUG_FUNC_ENTER();
    1839    
     1975    COCOA_LOG_FLOW(("%s: self=%p pParentView=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)pParentView));
     1976
    18401977    VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
    18411978    [pRunner addObj:self selector:@selector(vboxReparentUI:) arg:pParentView];
    18421979
    1843     DEBUG_FUNC_LEAVE();
     1980    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    18441981}
    18451982
    18461983- (void)vboxReparentUI:(NSView *)pParentView
    18471984{
    1848     DEBUG_FUNC_ENTER();
     1985    COCOA_LOG_FLOW(("%s: self=%p pParentView=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)pParentView));
    18491986
    18501987    /* Make sure the window is removed from any previous parent window. */
    … …  
    18652002    }
    18662003   
    1867     DEBUG_FUNC_LEAVE();
     2004    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    18682005}
    18692006
    18702007- (void)vboxTryDrawUI
    18712008{
     2009    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
     2010   
     2011    if ([self isHidden])
     2012    {
     2013        COCOA_LOG_FLOW(("%s: returns - request to draw on a hidden view\n", __PRETTY_FUNCTION__));
     2014        return;
     2015    }
     2016
     2017    if ([[self overlayWin] parentWindow] == nil)
     2018    {
     2019        COCOA_LOG_FLOW(("%s: returns - request to draw a view w/o a parent\n", __PRETTY_FUNCTION__));
     2020        return;
     2021    }
     2022   
    18722023    const VBOXVR_SCR_COMPOSITOR *pCompositor;
    1873     DEBUG_MSG(("My[%p]: DrawUI\n", self));
    1874    
    1875     if ([self isHidden])
    1876     {
    1877         DEBUG_INFO(("request to draw on a hidden view"));
    1878         return;
    1879     }
    1880 
    1881     if ([[self overlayWin] parentWindow] == nil)
    1882     {
    1883         DEBUG_INFO(("request to draw a view w/o a parent"));
    1884         return;
    1885     }
    1886    
    18872024    int rc = renderspuVBoxCompositorLock(m_pWinInfo, &pCompositor);
    18882025    if (RT_FAILURE(rc))
    18892026    {
    1890         DEBUG_WARN(("renderspuVBoxCompositorLock failed\n"));
     2027        COCOA_LOG_FLOW(("%s: returns - renderspuVBoxCompositorLock failed (%Rrc)\n", __PRETTY_FUNCTION__, rc));
    18912028        return;
    18922029    }
    18932030
     2031#ifndef IN_VMSVGA3D
    18942032    if (!pCompositor && !m_fCleanupNeeded)
    18952033    {
    1896         DEBUG_MSG(("My[%p]: noCompositorUI\n", self));
    18972034        renderspuVBoxCompositorUnlock(m_pWinInfo);
     2035        COCOA_LOG_FLOW(("%s: returns - noCompositorUI\n", __PRETTY_FUNCTION__));
    18982036        return;
    18992037    }
     2038#endif
    19002039
    19012040    VBOXVR_SCR_COMPOSITOR TmpCompositor;
    … …  
    19102049            if (![self vboxSharedCtxCreate])
    19112050            {
    1912                 DEBUG_WARN(("vboxSharedCtxCreate failed\n"));
     2051                COCOA_LOG_FLOW(("%s: returns - vboxSharedCtxCreate failed\n", __PRETTY_FUNCTION__));
    19132052                return;
    19142053            }
    … …  
    19202059            Assert(!m_fCleanupNeeded);
    19212060            if (!pCompositor)
     2061            {
     2062                COCOA_LOG_FLOW(("%s: returns - Failed to reacquire compositor\n", __PRETTY_FUNCTION__));
    19222063                return;
     2064            }
    19232065        }
    19242066    }
    19252067    else
    19262068    {
    1927         DEBUG_MSG(("My[%p]: NeedCleanup\n", self));
     2069        DEBUG_MSG(("%s: NeedCleanup\n", __PRETTY_FUNCTION__));
    19282070        Assert(m_fCleanupNeeded);
    19292071        CrVrScrCompositorInit(&TmpCompositor, NULL);
    … …  
    19332075    if ([self lockFocusIfCanDraw])
    19342076    {
     2077        COCOA_LOG_FLOW(("%s: Calling vboxPresent\n", __PRETTY_FUNCTION__));
    19352078        [self vboxPresent:pCompositor];           
    19362079        [self unlockFocus];
    19372080    }
     2081#ifndef IN_VMSVGA3D /** @todo VMSVGA3 */
    19382082    else if (!m_pWinInfo->visible)
    19392083    {
    1940         DEBUG_MSG(("My[%p]: NotVisible\n", self));
     2084        COCOA_LOG_FLOW(("%s: NotVisible\n", __PRETTY_FUNCTION__));
    19412085        m_fCleanupNeeded = false;
    19422086    }
     2087#endif   
    19432088    else
    19442089    {
    1945         DEBUG_MSG(("My[%p]: Reschedule\n", self));
     2090        COCOA_LOG_FLOW(("%s: Reschedule\n", __PRETTY_FUNCTION__));
    19462091        [NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(vboxTryDrawUI) userInfo:nil repeats:NO];
    19472092    }
    19482093   
    19492094    renderspuVBoxCompositorUnlock(m_pWinInfo);
     2095    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    19502096}
    19512097
    19522098- (void)swapFBO
    19532099{
    1954     DEBUG_FUNC_ENTER();
     2100    COCOA_LOG_FLOW(("%s: self=%p - m_pGLCtx=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)m_pGLCtx));
    19552101    [m_pGLCtx flushBuffer];
    1956     DEBUG_FUNC_LEAVE();
    1957 }
    1958 
    1959 - (void)vboxPresent:(const VBOXVR_SCR_COMPOSITOR*)pCompositor
    1960 {
     2102    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
     2103}
     2104
     2105- (void)vboxPresent:(PCVBOXVR_SCR_COMPOSITOR)pCompositor
     2106{
     2107    COCOA_LOG_FLOW(("%s: self=%p pCompositor=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)pCompositor));
     2108    /*DEBUG_MSG(("OVIW(%p): renderFBOToView\n", (void *)self));*/
     2109    AssertPtr(pCompositor);
     2110
    19612111    VBOX_CR_RENDER_CTX_INFO CtxInfo;   
    1962     DEBUG_MSG(("OVIW(%p): renderFBOToView\n", (void *)self));   
    1963    
    1964     Assert(pCompositor);
    1965 
    19662112    vboxCtxEnter(m_pSharedGLCtx, &CtxInfo);
    19672113   
    … …  
    19692115   
    19702116    vboxCtxLeave(&CtxInfo);
    1971 }
    1972 
    1973 - (void)vboxPresentCS:(const VBOXVR_SCR_COMPOSITOR *)pCompositor
    1974 {
     2117    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
     2118}
     2119
     2120- (void)vboxPresentCS:(PCVBOXVR_SCR_COMPOSITOR)pCompositor
     2121{
     2122    COCOA_LOG_FLOW(("%s: self=%p pCompositor=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)pCompositor));
    19752123    if ([m_pSharedGLCtx view] != self)
    19762124    {
    1977         DEBUG_MSG(("OVIW(%p): not current view of shared ctx! Switching ...\n", (void *)self));
     2125        COCOA_LOG_FLOW(("%s: Not current view of shared ctx! Switching... (self=%p, view=%p, m_pSharedGLCtx)\n",
     2126                        __PRETTY_FUNCTION__, (void *)self, (void *)[m_pSharedGLCtx view], (void *)m_pSharedGLCtx));
    19782127        [m_pSharedGLCtx setView: self];
    19792128        m_fNeedViewportUpdate = true;
    … …  
    19982147    [m_pSharedGLCtx flushBuffer];
    19992148#endif
     2149
     2150    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    20002151}
    20012152
    … …  
    20242175}
    20252176
    2026 - (void)vboxPresentToViewCS:(const VBOXVR_SCR_COMPOSITOR*)pCompositor
     2177- (void)vboxPresentToViewCS:(PCVBOXVR_SCR_COMPOSITOR)pCompositor
    20272178{
    20282179    NSRect r = [self frame];
    2029     float xStretch;
    2030     float yStretch;
    2031     DEBUG_MSG(("OVIW(%p): rF2V frame: [%i, %i, %i, %i]\n", (void *)self, (int)r.origin.x, (int)r.origin.y, (int)r.size.width, (int)r.size.height));
     2180    COCOA_LOG_FLOW(("%s: self=%p - r={%d,%d %d,%d}\n", __PRETTY_FUNCTION__, (void *)self,
     2181                    (int)r.origin.x, (int)r.origin.y, (int)r.size.width, (int)r.size.height));
    20322182
    20332183#if 1 /* Set to 0 to see the docktile instead of the real output */
    … …  
    20452195    m_fDataVisible = false;
    20462196   
     2197    float xStretch;
     2198    float yStretch;
    20472199    CrVrScrCompositorGetStretching(pCompositor, &xStretch, &yStretch);
    20482200       
    … …  
    21162268    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
    21172269    [m_pSharedGLCtx flushBuffer];
    2118 }
    2119 
    2120 - (void)presentComposition:(const VBOXVR_SCR_COMPOSITOR_ENTRY *)pChangedEntry
    2121 {
     2270
     2271    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
     2272}
     2273
     2274- (void)presentComposition:(PCVBOXVR_SCR_COMPOSITOR_ENTRY)pChangedEntry
     2275{
     2276    COCOA_LOG_FLOW(("%s: self=%p pChangedEntry=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)pChangedEntry));
    21222277    [self vboxTryDraw];
    21232278}
    … …  
    21252280- (void)vboxBlitterSyncWindow
    21262281{
     2282    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
    21272283    CR_BLITTER_WINDOW   WinInfo;
    21282284    NSRect              r;
    … …  
    21492305static int g_cVBoxTgaCtr = 0;
    21502306#endif
    2151 - (void)vboxPresentToDockTileCS:(const VBOXVR_SCR_COMPOSITOR*)pCompositor
    2152 {
     2307- (void)vboxPresentToDockTileCS:(PCVBOXVR_SCR_COMPOSITOR)pCompositor
     2308{
     2309    COCOA_LOG_FLOW(("%s: self=%p pCompositor=%p\n", __PRETTY_FUNCTION__, (void *)self, (void *)pCompositor));
    21532310    NSRect      r   = [self frame];
    21542311    NSRect      rr  = NSZeroRect;
    2155     GLint       i   = 0;
    21562312    NSDockTile *pDT = nil;
    21572313    float       xStretch;
    … …  
    22072363                if (RT_SUCCESS(rc))
    22082364                {
    2209                     int rc = CrBltEnter(m_pBlitter);
     2365                    rc = CrBltEnter(m_pBlitter);
    22102366                    if (RT_SUCCESS(rc))
    22112367                    {                   
    … …  
    22662422            glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0);
    22672423            glReadBuffer(GL_BACK);
     2424
    22682425            /* Here the magic of reading the FBO content in our own buffer
    22692426             * happens. We have to lock this access, in the case the dock
    … …  
    22932450- (void)clearVisibleRegions
    22942451{
    2295     DEBUG_FUNC_ENTER();
    22962452    if (m_paClipRects)
    22972453    {
    … …  
    23002456    }
    23012457    m_cClipRects = 0;
    2302     DEBUG_FUNC_LEAVE();
    23032458}
    23042459
    … …  
    23142469}
    23152470
    2316 - (void)setVisibleRegions:(GLint)cRects paRects:(const GLint*)paRects
    2317 {
    2318     DEBUG_FUNC_ENTER();
     2471- (void)setVisibleRegions:(GLint)cRects paRects:(const GLint *)paRects
     2472{
     2473    COCOA_LOG_FLOW(("%s: self=%p cRects=%d paRects=%p\n", __PRETTY_FUNCTION__, (void *)self, cRects, (void *)paRects));
    23192474    GLint cOldRects = m_cClipRects;
    2320 
    2321     DEBUG_MSG_1(("OVIW(%p): setVisibleRegions: cRects=%d\n", (void *)self, cRects));
    23222475
    23232476    [self clearVisibleRegions];
    … …  
    23312484#endif
    23322485
    2333         m_paClipRects = (GLint*)RTMemAlloc(sizeof(GLint) * 4 * cRects);
    2334         m_cClipRects = cRects;
    2335         memcpy(m_paClipRects, paRects, sizeof(GLint) * 4 * cRects);
    2336     }
    2337    
    2338     DEBUG_FUNC_LEAVE();
     2486        m_paClipRects = (GLint *)RTMemDup(paRects, sizeof(GLint) * 4 * cRects);
     2487        m_cClipRects  = cRects;
     2488    }
     2489   
     2490    COCOA_LOG_FLOW(("%s: returns\n", __PRETTY_FUNCTION__));
    23392491}
    23402492
    23412493- (NSView *)dockTileScreen
    23422494{
    2343     DEBUG_FUNC_ENTER();
    2344     NSView *contentView = [[[NSApplication sharedApplication] dockTile] contentView];
    2345     NSView *screenContent = nil;
     2495    COCOA_LOG_FLOW(("%s: self=%p\n", __PRETTY_FUNCTION__, (void *)self));
     2496    NSView *pContentView = [[[NSApplication sharedApplication] dockTile] contentView];
     2497    NSView *pScreenContent = nil;
    23462498
    23472499    /*
    … …  
    23492501     * screen which is previewed in the dock.
    23502502     */
    2351     if ([contentView respondsToSelector:@selector(screenContentWithParentView:)])
    2352         screenContent = [contentView performSelector:@selector(screenContentWithParentView:) withObject:(id)m_pParentView];
     2503    if ([pContentView respondsToSelector:@selector(screenContentWithParentView:)])
     2504        pScreenContent = [pContentView performSelector:@selector(screenContentWithParentView:) withObject:(id)m_pParentView];
    23532505    /*
    23542506     * If it fails, fall back to the old variant (VBox...).
    23552507     */
    2356     else if ([contentView respondsToSelector:@selector(screenContent)])
    2357         screenContent = [contentView performSelector:@selector(screenContent)];
    2358    
    2359     DEBUG_FUNC_LEAVE();
    2360     return screenContent;
     2508    else if ([pContentView respondsToSelector:@selector(screenContent)])
     2509        pScreenContent = [pContentView performSelector:@selector(screenContent)];
     2510   
     2511    COCOA_LOG_FLOW(("%s: returns %p (pContentView=%p)\n", __PRETTY_FUNCTION__, (void *)pScreenContent, (void *)pContentView));
     2512    return pScreenContent;
    23612513}
    23622514
    23632515- (void)reshapeDockTile
    23642516{
    2365     DEBUG_FUNC_ENTER();
     2517    COCOA_LOG_FLOW(("%s:\n", __PRETTY_FUNCTION__));
    23662518    NSRect newFrame = NSZeroRect;
    2367 
    23682519    NSView *pView = [self dockTileScreen];
    23692520    if (pView != nil)
    … …  
    23872538        [m_DockTileView setFrame: newFrame];
    23882539    }
    2389     DEBUG_FUNC_LEAVE();
     2540    COCOA_LOG_FLOW(("%s: returns - newFrame={%d,%d %d,%d} pView=%d\n", __PRETTY_FUNCTION__,  (int)newFrame.origin.x,
     2541                    (int)newFrame.origin.y, (int)newFrame.size.width, (int)newFrame.size.height, (void *)pView));
    23902542}
    23912543
    … …  
    24002552void cocoaGLCtxCreate(NativeNSOpenGLContextRef *ppCtx, GLbitfield fVisParams, NativeNSOpenGLContextRef pSharedCtx)
    24012553{
    2402     DEBUG_FUNC_ENTER();
     2554    COCOA_LOG_FLOW(("cocoaGLCtxCreate: ppCtx=%p fVisParams=%#x pSharedCtx=%p\n", (void *)ppCtx, fVisParams, (void *)pSharedCtx));
     2555    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    24032556    NSOpenGLPixelFormat *pFmt = nil;
    2404 
    2405     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    24062557
    24072558    NSOpenGLPixelFormatAttribute attribs[24] =
    … …  
    24152566    if (fVisParams & CR_ALPHA_BIT)
    24162567    {
    2417         DEBUG_MSG(("CR_ALPHA_BIT requested\n"));
     2568        COCOA_LOG_FLOW(("  CR_ALPHA_BIT requested\n"));
    24182569        attribs[i++] = NSOpenGLPFAAlphaSize;
    24192570        attribs[i++] = 8;
    … …  
    24212572    if (fVisParams & CR_DEPTH_BIT)
    24222573    {
    2423         DEBUG_MSG(("CR_DEPTH_BIT requested\n"));
     2574        COCOA_LOG_FLOW(("  CR_DEPTH_BIT requested\n"));
    24242575        attribs[i++] = NSOpenGLPFADepthSize;
    24252576        attribs[i++] = 24;
    … …  
    24272578    if (fVisParams & CR_STENCIL_BIT)
    24282579    {
    2429         DEBUG_MSG(("CR_STENCIL_BIT requested\n"));
     2580        COCOA_LOG_FLOW(("  CR_STENCIL_BIT requested\n"));
    24302581        attribs[i++] = NSOpenGLPFAStencilSize;
    24312582        attribs[i++] = 8;
    … …  
    24332584    if (fVisParams & CR_ACCUM_BIT)
    24342585    {
    2435         DEBUG_MSG(("CR_ACCUM_BIT requested\n"));
     2586        COCOA_LOG_FLOW(("  CR_ACCUM_BIT requested\n"));
    24362587        attribs[i++] = NSOpenGLPFAAccumSize;
    24372588        if (fVisParams & CR_ALPHA_BIT)
    … …  
    24422593    if (fVisParams & CR_MULTISAMPLE_BIT)
    24432594    {
    2444         DEBUG_MSG(("CR_MULTISAMPLE_BIT requested\n"));
     2595        COCOA_LOG_FLOW(("  CR_MULTISAMPLE_BIT requested\n"));
    24452596        attribs[i++] = NSOpenGLPFASampleBuffers;
    24462597        attribs[i++] = 1;
    … …  
    24502601    if (fVisParams & CR_DOUBLE_BIT)
    24512602    {
    2452         DEBUG_MSG(("CR_DOUBLE_BIT requested\n"));
     2603        COCOA_LOG_FLOW(("  CR_DOUBLE_BIT requested\n"));
    24532604        attribs[i++] = NSOpenGLPFADoubleBuffer;
    24542605    }
    … …  
    24562607    {
    24572608        /* We don't support that.
    2458         DEBUG_MSG(("CR_STEREO_BIT requested\n"));
     2609        COCOA_LOG_FLOW(("  CR_STEREO_BIT requested\n"));
    24592610        attribs[i++] = NSOpenGLPFAStereo;
    24602611        */
    … …  
    24632614    if (VBoxOglIsOfflineRenderingAppropriate())
    24642615    {
    2465         DEBUG_MSG(("Offline rendering is enabled\n"));
     2616        COCOA_LOG_FLOW(("  Offline rendering is enabled\n"));
    24662617        attribs[i++] = NSOpenGLPFAAllowOfflineRenderers;
    24672618    }
    … …  
    24842635            printf ("Couldn't enable MT OpenGL engine!\n");
    24852636        */
    2486 
    2487         DEBUG_MSG(("New context %X\n", (uint)*ppCtx));
    2488     }
     2637    }
     2638    else
     2639        *ppCtx = NULL;
    24892640
    24902641    [pPool release];
    2491    
    2492     DEBUG_FUNC_LEAVE();
     2642    COCOA_LOG_FLOW(("cocoaGLCtxDestroy: returns *ppCtx=%p\n", (void *)*ppCtx));
    24932643}
    24942644
    24952645void cocoaGLCtxDestroy(NativeNSOpenGLContextRef pCtx)
    24962646{
    2497     DEBUG_FUNC_ENTER();
     2647    COCOA_LOG_FLOW(("cocoaGLCtxDestroy: pCtx=%p\n", (void *)pCtx));
    24982648    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    24992649
    … …  
    25022652
    25032653    [pPool release];
    2504     DEBUG_FUNC_LEAVE();
     2654    COCOA_LOG_FLOW(("cocoaGLCtxDestroy: returns\n"));
    25052655}
    25062656
    … …  
    25102660*
    25112661********************************************************************************/
     2662static OverlayView *vboxViewCreate(WindowInfo *pWinInfo, NativeNSViewRef pParentView)
     2663{
     2664    COCOA_LOG_FLOW(("vboxViewCreate: pWinInfo=%p pParentView=%p\n", pWinInfo, (void *)pParentView));
     2665
     2666    /* Create our worker view. */
     2667    OverlayView *pView = [[OverlayView alloc] initWithFrame:NSZeroRect
     2668                                                     thread:RTThreadSelf()
     2669                                                 parentView:pParentView
     2670                                                    winInfo:pWinInfo];
     2671
     2672    if (pView)
     2673    {
     2674        /* We need a real window as container for the view */
     2675        [[OverlayWindow alloc] initWithParentView:pParentView overlayView:pView];
     2676        /* Return the freshly created overlay view */
     2677        COCOA_LOG_FLOW(("vboxViewCreate: returns %p\n", (void *)pView));
     2678        return pView;
     2679    }
     2680   
     2681    COCOA_LOG_FLOW(("vboxViewCreate: returns NULL\n"));
     2682    return NULL;
     2683}
     2684
     2685#ifndef IN_VMSVGA3D
     2686
    25122687typedef struct CR_RCD_CREATEVIEW
    25132688{
    … …  
    25192694} CR_RCD_CREATEVIEW;
    25202695
    2521 static OverlayView * vboxViewCreate(WindowInfo *pWinInfo, NativeNSViewRef pParentView)
    2522 {
    2523     DEBUG_FUNC_ENTER();
    2524     /* Create our worker view */
    2525     OverlayView* pView = [[OverlayView alloc] initWithFrame:NSZeroRect thread:RTThreadSelf() parentView:pParentView winInfo:pWinInfo];
    2526 
    2527     if (pView)
    2528     {
    2529         /* We need a real window as container for the view */
    2530         [[OverlayWindow alloc] initWithParentView:pParentView overlayView:pView];
    2531         /* Return the freshly created overlay view */
    2532         DEBUG_FUNC_LEAVE();
    2533         return pView;
    2534     }
    2535    
    2536     DEBUG_FUNC_LEAVE();
    2537     return NULL;
    2538 }
    2539 
    25402696static DECLCALLBACK(void) vboxRcdCreateView(void *pvCb)
    25412697{
    2542     DEBUG_FUNC_ENTER();
    2543     CR_RCD_CREATEVIEW * pCreateView = (CR_RCD_CREATEVIEW*)pvCb;
     2698    CR_RCD_CREATEVIEW *pCreateView = (CR_RCD_CREATEVIEW *)pvCb;
    25442699    pCreateView->pView = vboxViewCreate(pCreateView->pWinInfo, pCreateView->pParentView);
    2545     DEBUG_FUNC_LEAVE();
    2546 }
     2700    COCOA_LOG_FLOW(("vboxRcdCreateView: returns pView=%p\n", (void *)pCreateView->pView));
     2701}
     2702
     2703#endif /* !IN_VMSVGA3D */
    25472704
    25482705void cocoaViewCreate(NativeNSViewRef *ppView, WindowInfo *pWinInfo, NativeNSViewRef pParentView, GLbitfield fVisParams)
    25492706{
    2550     DEBUG_FUNC_ENTER();
     2707    COCOA_LOG_FLOW(("cocoaViewCreate: ppView=%p pWinInfo=%p pParentView=%p fVisParams=%#x\n",
     2708                    (void *)ppView, (void *)pWinInfo, (void *)pParentView, fVisParams));
    25512709    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    25522710
     2711    /* make sure all tasks are run, to preserve the order */
    25532712    VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
    2554     /* make sure all tasks are run, to preserve the order */
    25552713    [pRunner runTasksSyncIfPossible];
    25562714   
    25572715    renderspuWinRetain(pWinInfo);
    25582716
     2717#ifndef IN_VMSVGA3D
    25592718    if (renderspuCalloutAvailable())
    25602719    {
    … …  
    25682727    }
    25692728    else
    2570     {
    2571         DEBUG_MSG(("no callout available on createWindow\n"));
     2729#endif
     2730    {
     2731        DEBUG_MSG_NOT_VMSVGA3D(("no callout available on createWindow\n"));
    25722732#if 0
    25732733        dispatch_sync(dispatch_get_main_queue(), ^{
    … …  
    25832743   
    25842744    [pPool release];
    2585    
    2586     DEBUG_FUNC_LEAVE();
     2745    COCOA_LOG_FLOW(("cocoaViewCreate: returns *ppView=%p\n", (void *)*ppView));
    25872746}
    25882747
    25892748void cocoaViewReparent(NativeNSViewRef pView, NativeNSViewRef pParentView)
    25902749{
    2591     DEBUG_FUNC_ENTER();
     2750    COCOA_LOG_FLOW(("cocoaViewReparent: pView=%p pParentView=%p\n", (void *)pView, (void *)pParentView));
    25922751    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    25932752
    2594     OverlayView* pOView = (OverlayView*)pView;
    2595 
     2753    OverlayView *pOView = (OverlayView *)pView;
    25962754    if (pOView)
    2597     {
    25982755        [pOView vboxReparent:pParentView];
    2599     }
    26002756
    26012757    [pPool release];
    2602    
    2603     DEBUG_FUNC_LEAVE();
    2604 }
    2605 
    2606 typedef struct CR_RCD_DESTROYVIEW
    2607 {
    2608     OverlayView *pView;
    2609 } CR_RCD_DESTROYVIEW;
    2610 
    2611 static DECLCALLBACK(void) vboxRcdDestroyView(void *pvCb)
    2612 {
    2613     DEBUG_FUNC_ENTER();
    2614     CR_RCD_DESTROYVIEW * pDestroyView = (CR_RCD_DESTROYVIEW*)pvCb;
    2615     [pDestroyView->pView vboxDestroy];
    2616     DEBUG_FUNC_LEAVE();
     2758    COCOA_LOG_FLOW(("cocoaViewReparent: returns\n"));
    26172759}
    26182760
    26192761void cocoaViewDestroy(NativeNSViewRef pView)
    26202762{
    2621     DEBUG_FUNC_ENTER();
     2763    COCOA_LOG_FLOW(("cocoaViewDestroy: pView=%p\n", (void *)pView));
    26222764    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    26232765
    … …  
    26262768
    26272769    [pPool release];
    2628 
    2629     DEBUG_FUNC_LEAVE();
     2770    COCOA_LOG_FLOW(("cocoaViewDestroy: returns\n"));
    26302771}
    26312772
    26322773void cocoaViewShow(NativeNSViewRef pView, GLboolean fShowIt)
    26332774{
    2634     DEBUG_FUNC_ENTER();
     2775    COCOA_LOG_FLOW(("cocoaViewShow: pView=%p fShowIt=%d\n", (void *)pView, fShowIt));
    26352776    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    26362777
    2637     [(OverlayView*)pView vboxSetVisible:fShowIt];
     2778    [(OverlayView *)pView vboxSetVisible:fShowIt];
    26382779
    26392780    [pPool release];
    2640     DEBUG_FUNC_LEAVE();
     2781    COCOA_LOG_FLOW(("cocoaViewShow: returns\n"));
    26412782}
    26422783
    26432784void cocoaViewDisplay(NativeNSViewRef pView)
    26442785{
    2645     DEBUG_FUNC_ENTER();
     2786    COCOA_LOG_FLOW(("cocoaViewDisplay: pView=%p\n", (void *)pView));
    26462787    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    26472788
     2789#ifndef IN_VMSVGA3D
    26482790    DEBUG_WARN(("cocoaViewDisplay should never happen!\n"));
    26492791    DEBUG_MSG_1(("cocoaViewDisplay %p\n", (void *)pView));
    2650     [(OverlayView*)pView swapFBO];
     2792#endif
     2793    [(OverlayView *)pView swapFBO];
    26512794
    26522795    [pPool release];
    2653    
    2654     DEBUG_FUNC_LEAVE();
     2796    COCOA_LOG_FLOW(("cocoaViewDisplay: returns\n"));
    26552797}
    26562798
    26572799void cocoaViewSetPosition(NativeNSViewRef pView, NativeNSViewRef pParentView, int x, int y)
    26582800{
    2659     DEBUG_FUNC_ENTER();
     2801    COCOA_LOG_FLOW(("cocoaViewSetPosition: pView=%p pParentView=%p x=%d y=%d\n", (void *)pView, (void *)pParentView, x, y));
    26602802    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    26612803
    2662     [(OverlayView*)pView vboxSetPos:NSMakePoint(x, y)];
     2804    [(OverlayView *)pView vboxSetPos:NSMakePoint(x, y)];
    26632805
    26642806    [pPool release];
    2665    
    2666     DEBUG_FUNC_LEAVE();
    2667 }
    2668 
    2669 void cocoaViewSetSize(NativeNSViewRef pView, int w, int h)
    2670 {
    2671     DEBUG_FUNC_ENTER();
     2807    COCOA_LOG_FLOW(("cocoaViewSetPosition: returns\n"));
     2808}
     2809
     2810void cocoaViewSetSize(NativeNSViewRef pView, int cx, int cy)
     2811{
     2812    COCOA_LOG_FLOW(("cocoaViewSetSize: pView=%p cx=%d cy=%d\n", (void *)pView, cx, cy));
    26722813    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    26732814
    2674     [(OverlayView*)pView vboxSetSize:NSMakeSize(w, h)];
     2815    [(OverlayView *)pView vboxSetSize:NSMakeSize(cx, cy)];
    26752816
    26762817    [pPool release];
    2677    
    2678     DEBUG_FUNC_LEAVE();
    2679 }
     2818    COCOA_LOG_FLOW(("cocoaViewSetSize: returns\n"));
     2819}
     2820
     2821#ifndef IN_VMSVGA3D
    26802822
    26812823typedef struct CR_RCD_GETGEOMETRY
    … …  
    26872829static DECLCALLBACK(void) vboxRcdGetGeomerty(void *pvUser)
    26882830{
    2689     DEBUG_FUNC_ENTER();
    2690     CR_RCD_GETGEOMETRY * pGetGeometry = (CR_RCD_GETGEOMETRY *)pvUser;
     2831    CR_RCD_GETGEOMETRY *pGetGeometry = (CR_RCD_GETGEOMETRY *)pvUser;
    26912832    pGetGeometry->rect = [[pGetGeometry->pView window] frame];
    2692     DEBUG_FUNC_LEAVE();
    2693 }
    2694 
    2695 void cocoaViewGetGeometry(NativeNSViewRef pView, int *pX, int *pY, int *pW, int *pH)
    2696 {
     2833    COCOA_LOG_FLOW(("vboxRcdGetGeomerty: (x,y)=(%d,%d) (cx,cy)=(%d,%d)\n", pGetGeometry->rect.origin.x, pGetGeometry->rect.origin.y,
     2834                    pGetGeometry->rect.size.width, pGetGeometry->rect.heigth));
     2835}
     2836
     2837#endif /* !IN_VMSVGA3D */
     2838
     2839void cocoaViewGetGeometry(NativeNSViewRef pView, int *px, int *py, int *pcx, int *pcy)
     2840{
     2841    COCOA_LOG_FLOW(("cocoaViewGetGeometry: pView=%p px=%p py=%p pcx=%p pcy=%p\n",
     2842                    (void *)pView, (void *)px, (void *)py, (void *)pcx, (void *)pcy));
    26972843    NSAutoreleasePool *pPool;
    2698     DEBUG_FUNC_ENTER();
    26992844    pPool = [[NSAutoreleasePool alloc] init];
    27002845
     2846    /* make sure all tasks are run, to preserve the order */
     2847    VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
     2848    [pRunner runTasksSyncIfPossible];
     2849   
    27012850    NSRect frame;
    2702     VBoxMainThreadTaskRunner *pRunner = [VBoxMainThreadTaskRunner globalInstance];
    2703     /* make sure all tasks are run, to preserve the order */
    2704     [pRunner runTasksSyncIfPossible];
    2705    
    2706    
     2851#ifndef IN_VMSVGA3D
    27072852    if (renderspuCalloutAvailable())
    27082853    {
    … …  
    27132858    }
    27142859    else
    2715     {
    2716         DEBUG_MSG(("no callout available on getGeometry\n"));
     2860#endif
     2861    {
     2862        DEBUG_MSG_NOT_VMSVGA3D(("no callout available on getGeometry\n"));
    27172863        frame = [[pView window] frame];
    27182864    }
    27192865   
    2720     *pX = frame.origin.x;
    2721     *pY = frame.origin.y;
    2722     *pW = frame.size.width;
    2723     *pH = frame.size.height;
     2866    *px = frame.origin.x;
     2867    *py = frame.origin.y;
     2868    *pcx = frame.size.width;
     2869    *pcy = frame.size.height;
    27242870
    27252871    [pPool release];
    2726    
    2727     DEBUG_FUNC_LEAVE();
    2728 }
    2729 
    2730 void cocoaViewPresentComposition(NativeNSViewRef pView, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry)
    2731 {
    2732     DEBUG_FUNC_ENTER();
     2872    COCOA_LOG_FLOW(("cocoaViewGetGeometry: returns *px=%d, *py=%d, *pcx=%d, *pcy=%d\n", *px, *py, *pcx, *pcy));
     2873}
     2874
     2875void cocoaViewPresentComposition(NativeNSViewRef pView, PCVBOXVR_SCR_COMPOSITOR_ENTRY pChangedEntry)
     2876{
     2877    COCOA_LOG_FLOW(("cocoaViewPresentComposition: pView=%p pChangedEntry=%p\n", (void *)pView, (void *)pChangedEntry));
    27332878    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    27342879    NSOpenGLContext *pCtx;
    27352880   
    27362881    /* view should not necesserily have a context set */
    2737     pCtx = [(OverlayView*)pView glCtx];
     2882    pCtx = [(OverlayView *)pView glCtx];
    27382883    if (!pCtx)
    27392884    {
    2740         ContextInfo * pCtxInfo = renderspuDefaultSharedContextAcquire();
     2885#ifdef IN_VMSVGA3D /** @todo VMSVGA3 */
     2886        pCtx = NULL;
     2887#else
     2888        ContextInfo *pCtxInfo = renderspuDefaultSharedContextAcquire();
    27412889        if (!pCtxInfo)
    27422890        {
    … …  
    27492897       
    27502898        pCtx = pCtxInfo->context;
     2899#endif
    27512900       
    2752         [(OverlayView*)pView setGLCtx:pCtx];
    2753     }
    2754    
    2755     [(OverlayView*)pView presentComposition:pChangedEntry];
     2901        [(OverlayView *)pView setGLCtx:pCtx];
     2902    }
     2903   
     2904    [(OverlayView *)pView presentComposition:pChangedEntry];
    27562905
    27572906    [pPool release];
    2758    
    2759     DEBUG_FUNC_LEAVE();
     2907    COCOA_LOG_FLOW(("cocoaViewPresentComposition: returns\n"));
    27602908}
    27612909
    27622910void cocoaViewMakeCurrentContext(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx)
    27632911{
     2912    COCOA_LOG_FLOW(("cocoaViewMakeCurrentContext: pView=%p pCtx=%p\n", (void *)pView, (void *)pCtx));
     2913    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
     2914
     2915    if (pView)
     2916    {
     2917        [(OverlayView *)pView setGLCtx:pCtx];
     2918        [(OverlayView *)pView makeCurrentFBO];
     2919    }
     2920    else
     2921    {
     2922        [NSOpenGLContext clearCurrentContext];
     2923    }
     2924
     2925    [pPool release];
     2926    COCOA_LOG_FLOW(("cocoaViewMakeCurrentContext: returns\n"));
     2927}
     2928
     2929GLboolean cocoaViewNeedsEmptyPresent(NativeNSViewRef pView)
     2930{
     2931    COCOA_LOG_FLOW(("cocoaViewNeedsEmptyPresent: pView=%p\n", (void *)pView));
     2932    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
     2933
     2934    GLboolean fNeedsPresent = [(OverlayView *)pView vboxNeedsEmptyPresent];
     2935
     2936    [pPool release];
     2937    COCOA_LOG_FLOW(("cocoaViewNeedsEmptyPresent: returns %d\n", fNeedsPresent));
     2938    return fNeedsPresent;
     2939}
     2940
     2941void cocoaViewSetVisibleRegion(NativeNSViewRef pView, GLint cRects, const GLint *paRects)
     2942{
     2943    COCOA_LOG_FLOW(("cocoaViewSetVisibleRegion: pView=%p cRects=%d paRects=%p)\n", (void *)pView, cRects, (void const *)paRects));
     2944    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
     2945
     2946    [(OverlayView *)pView setVisibleRegions:cRects paRects:paRects];
     2947
     2948    [pPool release];
     2949    COCOA_LOG_FLOW(("cocoaViewSetVisibleRegion: returns\n"));
     2950}
     2951
     2952
     2953#ifdef IN_VMSVGA3D
     2954/*
     2955 * VMSVGA3D interface.
     2956 */
     2957
     2958VMSVGA3D_DECL(void) vmsvga3dCocoaCreateContext(NativeNSOpenGLContextRef *ppCtx, NativeNSOpenGLContextRef pSharedCtx)
     2959{
     2960    cocoaGLCtxCreate(ppCtx, CR_ALPHA_BIT | CR_DEPTH_BIT | CR_DOUBLE_BIT, pSharedCtx);
     2961}
     2962
     2963VMSVGA3D_DECL(void) vmsvga3dCocoaDestroyContext(NativeNSOpenGLContextRef pCtx)
     2964{
     2965    cocoaGLCtxDestroy(pCtx);
     2966}
     2967
     2968VMSVGA3D_DECL(void) vmsvga3dCocoaCreateView(NativeNSViewRef *ppView, NativeNSViewRef pParentView)
     2969{
     2970    /** @todo share WinInfo with caller and maintain it better. */
     2971    WindowInfo *pWinInfo = (WindowInfo *)RTMemAllocZ(sizeof(WindowInfo));
     2972    AssertLogRelReturnVoid(pWinInfo);
     2973    pWinInfo->cRefs = 1;
     2974    RTCritSectInit(&pWinInfo->CompositorLock);
     2975
     2976    cocoaViewCreate(ppView, pWinInfo, pParentView, 0 /* fVisParams - ignored */);
     2977}
     2978
     2979VMSVGA3D_DECL(void) vmsvga3dCocoaDestroyView(NativeNSViewRef pView)
     2980{
     2981    cocoaViewDestroy(pView);
     2982}
     2983
     2984VMSVGA3D_DECL(void) vmsvga3dCocoaViewSetPosition(NativeNSViewRef pView, NativeNSViewRef pParentView, int x, int y)
     2985{
     2986    cocoaViewSetPosition(pView, pParentView, x, y);
     2987}
     2988
     2989VMSVGA3D_DECL(void) vmsvga3dCocoaViewSetSize(NativeNSViewRef pView, int w, int h)
     2990{
     2991    cocoaViewSetSize(pView, w, h);
     2992}
     2993
     2994VMSVGA3D_DECL(void) vmsvga3dCocoaViewMakeCurrentContext(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx)
     2995{
     2996    cocoaViewMakeCurrentContext(pView, pCtx);
     2997}
     2998
     2999VMSVGA3D_DECL(void) vmsvga3dCocoaSwapBuffers(NativeNSViewRef pView, NativeNSOpenGLContextRef pCtx)
     3000{
     3001# if 1
     3002    Assert([(OverlayView *)pView glCtx] == pCtx);
     3003    cocoaViewDisplay(pView);
     3004# else
    27643005    DEBUG_FUNC_ENTER();
    27653006    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    27663007
    2767     DEBUG_MSG(("cocoaViewMakeCurrentContext(%p, %p)\n", (void *)pView, (void *)pCtx));
    2768 
    2769     if (pView)
    2770     {
    2771         [(OverlayView*)pView setGLCtx:pCtx];
    2772         [(OverlayView*)pView makeCurrentFBO];
    2773     }
    2774     else
    2775     {
    2776         [NSOpenGLContext clearCurrentContext];
    2777     }
     3008    [pCtx flushBuffer];
    27783009
    27793010    [pPool release];
    2780    
    27813011    DEBUG_FUNC_LEAVE();
    2782 }
    2783 
    2784 GLboolean cocoaViewNeedsEmptyPresent(NativeNSViewRef pView)
    2785 {
    2786     DEBUG_FUNC_ENTER();
    2787    
    2788     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    2789 
    2790     GLboolean fNeedsPresent = [(OverlayView*)pView vboxNeedsEmptyPresent];
    2791 
    2792     [pPool release];
    2793    
    2794     DEBUG_FUNC_LEAVE();
    2795    
    2796     return fNeedsPresent;
    2797 }
    2798 
    2799 void cocoaViewSetVisibleRegion(NativeNSViewRef pView, GLint cRects, const GLint* paRects)
    2800 {
    2801     DEBUG_FUNC_ENTER();
    2802     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
    2803 
    2804     [(OverlayView*)pView setVisibleRegions:cRects paRects:paRects];
    2805 
    2806     [pPool release];
    2807    
    2808     DEBUG_FUNC_LEAVE();
    2809 }
     3012# endif
     3013}
     3014
     3015#endif /* IN_VMSVGA3D */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette