Changeset 80398 in vbox

Timestamp:

Aug 23, 2019 1:34:04 PM (6 years ago)

Author:

vboxsync

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

132867

Message:

Main: Get rid of VBOX_WITH_CROGL and replace with more generic VBOX_WITH_3D_ACCELERATION, bugref:9529

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• src-client/VMMDevInterface.cpp (modified) (1 diff)
• src-server/HostImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -655 +655 @@
 VBoxSVC_LDFLAGS.darwin    = -framework IOKit -framework SystemConfiguration
 
-ifdef VBOX_WITH_CROGL
+ifdef VBOX_WITH_3D_ACCELERATION
  VBoxSVC_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
  VBoxSVC_LDFLAGS.darwin += -framework OpenGL
@@ -928 +928 @@
 endif
 
-ifdef VBOX_WITH_CROGL
+ifdef VBOX_WITH_3D_ACCELERATION
  VBoxC_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
  VBoxC_LDFLAGS.darwin += -framework OpenGL

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -33 +33 @@
 # include "HGCM.h"
 # include "HGCMObjects.h"
-# if defined(RT_OS_DARWIN) && defined(VBOX_WITH_CROGL)
-#  include <VBox/HostServices/VBoxCrOpenGLSvc.h>
-# endif
 #endif
 

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -417 +417 @@
     }
 
-#ifdef VBOX_WITH_CROGL
+#ifdef VBOX_WITH_3D_ACCELERATION
     /* Test for 3D hardware acceleration support later when (if ever) need. */
     m->f3DAccelerationSupported = -1;
@@ -1430 +1430 @@
         alock.release();
 
-#ifdef VBOX_WITH_CROGL
+#ifdef VBOX_WITH_3D_ACCELERATION
         bool fSupported = VBoxOglIs3DAccelerationSupported();
 #else