Changeset 53755 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jan 6, 2015 9:06:53 PM (10 years ago)

Author:

vboxsync

Message:

VMSVGA3d: Cleaning up some of the dual-profile mess, switched back to using the 2.1 profile by default.

File:

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

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

@@ -238 +238 @@
 # define CR_OVERLAY_BIT         RT_BIT_32(8)
 # define CR_PBUFFER_BIT         RT_BIT_32(9)
-# define VMSVGA3D_LEGACY_PROFILE_BIT RT_BIT_32(31)
+# define VMSVGA3D_NON_DEFAULT_PROFILE_BIT RT_BIT_32(31)
 # define CR_ALL_BITS            UINT32_C(0x800003ff)
 
@@ -311 +311 @@
 
 
-#endif
+#endif /* IN_VMSVGA3D */
 
 
@@ -318 +318 @@
 {
 #ifdef IN_VMSVGA3D
+    return [NSOpenGLContext currentContext];
 #else
     GET_CONTEXT(pCtxInfo);
@@ -325 +326 @@
         return pCtxInfo->context;
     }
-#endif
-
     return nil;
+#endif
 }
 
 static bool vboxCtxSyncCurrentInfo(void)
 {
+#ifdef IN_VMSVGA3D
+    return false;
+#else
     bool fAdjusted = false;
-#ifdef IN_VMSVGA3D
-#else
     GET_CONTEXT(pCtxInfo);
     NSOpenGLContext *pCtx = [NSOpenGLContext currentContext];
@@ -354 +355 @@
         fAdjusted = true;
     }
-#endif
     
     return fAdjusted;
+#endif
 }
 
@@ -2026 +2027 @@
         return;
     }
+
+#ifdef IN_VMSVGA3D
+    if (!m_pSharedGLCtx)
+    {
+        Assert(!m_fDataVisible);
+        Assert(!m_fCleanupNeeded);
+        if (![self vboxSharedCtxCreate])
+        {
+            COCOA_LOG_FLOW(("%s: returns - vboxSharedCtxCreate failed\n", __PRETTY_FUNCTION__));
+            return;
+        }
+        Assert(m_pSharedGLCtx);
+    }
+#endif
     
     const VBOXVR_SCR_COMPOSITOR *pCompositor;
@@ -2074 +2089 @@
     {
         DEBUG_MSG(("%s: NeedCleanup\n", __PRETTY_FUNCTION__));
+#ifndef IN_VMSVGA3D /** @todo VMSVGA3 */
         Assert(m_fCleanupNeeded);
+#endif
         CrVrScrCompositorInit(&TmpCompositor, NULL);
         pCompositor = &TmpCompositor;
@@ -2565 +2582 @@
     {
 #ifdef IN_VMSVGA3D
-# ifdef VBOX_VMSVGA3D_USE_OPENGL_CORE
-        NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,
-# else
-        NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersionLegacy,
-# endif
+        NSOpenGLPFAOpenGLProfile, (NSOpenGLPixelFormatAttribute)0,
 #endif
         NSOpenGLPFAAccelerated,
@@ -2578 +2591 @@
 
 #ifdef IN_VMSVGA3D
-    if (fVisParams & VMSVGA3D_LEGACY_PROFILE_BIT)
-    {
-# ifdef VBOX_VMSVGA3D_USE_OPENGL_CORE
-        attribs[1] = NSOpenGLProfileVersionLegacy;
-# else
-        AssertFailed();
-# endif
-    }
+    if (fVisParams & VMSVGA3D_NON_DEFAULT_PROFILE_BIT)
+        attribs[1] = VBOX_VMSVGA3D_DEFAULT_OGL_PROFILE >= 3.2 ? NSOpenGLProfileVersionLegacy :  NSOpenGLProfileVersion3_2Core;
+    else
+        attribs[1] = VBOX_VMSVGA3D_DEFAULT_OGL_PROFILE >= 3.2 ? NSOpenGLProfileVersion3_2Core : NSOpenGLProfileVersionLegacy;
 #endif
 
@@ -2984 +2993 @@
  */
 
-VMSVGA3D_DECL(void) vmsvga3dCocoaCreateContext(NativeNSOpenGLContextRef *ppCtx, NativeNSOpenGLContextRef pSharedCtx, bool fLegacy)
-{
-    cocoaGLCtxCreate(ppCtx, CR_ALPHA_BIT | CR_DEPTH_BIT | CR_DOUBLE_BIT | (fLegacy ? VMSVGA3D_LEGACY_PROFILE_BIT : 0), 
+VMSVGA3D_DECL(void) vmsvga3dCocoaCreateContext(NativeNSOpenGLContextRef *ppCtx, NativeNSOpenGLContextRef pSharedCtx, 
+                                               bool fOtherProfile)
+{
+    cocoaGLCtxCreate(ppCtx, CR_ALPHA_BIT | CR_DEPTH_BIT | CR_DOUBLE_BIT | (fOtherProfile ? VMSVGA3D_NON_DEFAULT_PROFILE_BIT : 0), 
                      pSharedCtx);
 }