Changeset 54167 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m

Timestamp:

Feb 12, 2015 12:20:56 AM (10 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d-cocoa.m/h: Build fix and dual profile support. (doesn't work better than the original)

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m (modified) (5 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m

@@ +1 @@
+/* $Id$ */
 /** @file
  * VirtualBox OpenGL Cocoa Window System Helper Implementation.
@@ -22 +23 @@
 
 #include <iprt/thread.h>
+#include <iprt/assert.h>
 
 /* Debug macros */
@@ -629 +631 @@
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
 
-#if 1
-    // @todo galitsyn: NSOpenGLPFAWindow was deprecated starting from OSX 10.9.
     // Consider to remove it and check if it's harmless.
     NSOpenGLPixelFormatAttribute attribs[] =
     {
-        NSOpenGLPFAWindow,
+        NSOpenGLPFAOpenGLProfile, (NSOpenGLPixelFormatAttribute)0,
+        //NSOpenGLPFAWindow, - obsolete/deprecated, try work without it...
+        NSOpenGLPFAAccelerated,
         NSOpenGLPFADoubleBuffer,
-        NSOpenGLPFAAccelerated,
         NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute)24,
         NSOpenGLPFAAlphaSize, (NSOpenGLPixelFormatAttribute)8,
@@ -642 +643 @@
         0
     };
-#else
-    NSOpenGLPixelFormatAttribute attribs[] =
-    {
-        NSOpenGLPFADoubleBuffer,
-        NSOpenGLPFAAccelerated,
-        NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute)24,
-        NSOpenGLPFADepthSize, 24,
-        NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,
-        0
-    };
-#endif
+    attribs[1] = fOtherProfile ? NSOpenGLProfileVersion3_2Core : NSOpenGLProfileVersionLegacy;
 
     /* Choose a pixel format */
     pFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attribs];
-
     if (pFmt)
     {
         *ppCtx = [[VMSVGA3DOpenGLContext alloc] initWithFormat:pFmt shareContext:pShareCtx];
         DEBUG_MSG(("New context %p\n", (void *)*ppCtx));
+    }
+    else
+    {
+        AssertFailed();
+        *ppCtx = NULL;
     }
 
@@ -765 +760 @@
     DEBUG_FUNC_LEAVE();
 }
+