Changeset 53546 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2014 11:54:40 AM (10 years ago)

Author:

vboxsync

Message:

Mac OS X host: make 3D test more informative when it determines that host 3D capabilities not sufficient.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp

@@ -122 +122 @@
     CGLPixelFormatObj   pixelFormat = NULL;
     GLint numPixelFormats = 0;
+    CGLError            rcCgl;
 
     CGLPixelFormatAttribute attribs[] = {
@@ -135 +136 @@
     display = CGMainDisplayID();
     cglDisplayMask = CGDisplayIDToOpenGLDisplayMask(display);
-    CGLChoosePixelFormat(attribs, &pixelFormat, &numPixelFormats);
+    rcCgl = CGLChoosePixelFormat(attribs, &pixelFormat, &numPixelFormats);
+    if (rcCgl != kCGLNoError)
+    {
+        LogRel(("OpenGL Info: 3D test unable to choose pixel format (rcCgl=0x%X)\n", rcCgl));
+        return false;
+    }
 
     if (pixelFormat)
     {
         CGLContextObj cglContext = 0;
-        CGLCreateContext(pixelFormat, NULL, &cglContext);
+        rcCgl = CGLCreateContext(pixelFormat, NULL, &cglContext);
         CGLDestroyPixelFormat(pixelFormat);
+
+        if (rcCgl != kCGLNoError)
+        {
+            LogRel(("OpenGL Info: 3D test unable to create context (rcCgl=0x%X)\n", rcCgl));
+            return false;
+        }
+
         if (cglContext)
         {
@@ -157 +170 @@
                 isSupported = gluCheckExtension((const GLubyte*)"GL_EXT_texture_rectangle", strExt);
                 if (!isSupported)
-                    LogRel(("OpenGL Info: GL_EXT_texture_rectangle extension not supported\n"));
+                    LogRel(("OpenGL Info: 3D test found that GL_EXT_texture_rectangle extension not supported\n"));
             }
             else
-                LogRel(("OpenGL Info: GL_EXT_framebuffer_object extension not supported\n"));
+                LogRel(("OpenGL Info: 3D test found that GL_EXT_framebuffer_object extension not supported\n"));
 #endif /* VBOX_WITH_COCOA_QT */
             CGLDestroyContext(cglContext);
+            LogRel(("OpenGL Info: 3D test %spassed\n", isSupported == GL_TRUE ? "" : "not "));
             return isSupported == GL_TRUE ? true : false;
         }
+        else
+            LogRel(("OpenGL Info: 3D test unable to create context (internal error)\n"));
     }
+    else
+        LogRel(("OpenGL Info: 3D test unable to choose pixel format (internal error)\n"));
 
     return false;