Changeset 76246 in vbox for trunk

Timestamp:

Dec 15, 2018 6:33:25 PM (6 years ago)

Author:

vboxsync

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

127516

Message:

DevVGA-SVGA3d: dynamic loading of opengl (not enabled)

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA.cpp (modified) (1 diff)
• Graphics/DevVGA-SVGA3d-internal.h (modified) (1 diff)
• Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (5 diffs)
• Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -4049 +4049 @@
                     VMSVGAFIFO_GET_MORE_CMD_BUFFER_BREAK(pHdr, SVGA3dCmdHeader, cbCmd);
 
+                    if (RT_LIKELY(pThis->svga.f3DEnabled))
+                    { /* likely */ }
+                    else
+                    {
+                        LogRelMax(8, ("VMSVGA3d: 3D disabled, command %d skipped\n", enmCmdId));
+                        break;
+                    }
+
 /**
  * Check that the 3D command has at least a_cbMin of payload bytes after the

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -38 +38 @@
 *********************************************************************************************************************************/
 #include "DevVGA-SVGA3d.h"
+
+#if defined(VMSVGA3D_DYNAMIC_LOAD) && defined(VMSVGA3D_OPENGL)
+#include "DevVGA-SVGA3d-glLdr.h"
+#endif
 
 #ifdef RT_OS_WINDOWS

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -64 +64 @@
 #endif
 
+#ifdef VMSVGA3D_DYNAMIC_LOAD
+# define OGLGETPROCADDRESS glLdrGetProcAddress
+#else
 #ifdef RT_OS_WINDOWS
 # define OGLGETPROCADDRESS      MyWinGetProcAddress
@@ -89 +92 @@
 #else
 # define OGLGETPROCADDRESS(x)   glXGetProcAddress((const GLubyte *)x)
+#endif
 #endif
 
@@ -582 +586 @@
 int vmsvga3dInit(PVGASTATE pThis)
 {
+    int rc;
+
     AssertCompile(GL_TRUE == 1);
     AssertCompile(GL_FALSE == 0);
+
+#ifdef VMSVGA3D_DYNAMIC_LOAD
+    rc = glLdrInit();
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("VMSVGA3d: Error loading OpenGL library and resolving necessary functions: %Rrc\n", rc));
+        return rc;
+    }
+#endif
 
     /*
@@ -589 +604 @@
      */
     RTERRINFOSTATIC ErrInfo;
-    int rc = ExplicitlyLoadVBoxSVGA3D(true /*fResolveAllImports*/, RTErrInfoInitStatic(&ErrInfo));
+    rc = ExplicitlyLoadVBoxSVGA3D(true /*fResolveAllImports*/, RTErrInfoInitStatic(&ErrInfo));
     if (RT_FAILURE(rc))
     {
@@ -794 +809 @@
     pContext = pState->papContexts[1];
     VMSVGA3D_SET_CURRENT_CONTEXT(pState, pContext);
+
+#ifdef VMSVGA3D_DYNAMIC_LOAD
+    /* Context is set and it is possible now to resolve extension functions. */
+    rc = glLdrGetExtFunctions();
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("VMSVGA3d: Error resolving extension functions: %Rrc\n", rc));
+        return rc;
+    }
+#endif
 
     LogRel(("VMSVGA3d: OpenGL version: %s\n"

trunk/src/VBox/Devices/Makefile.kmk

@@ -278 +278 @@
  endif
  ifdef VBOX_WITH_VMSVGA3D
+  #VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
   VBoxDD_DEFS           += VBOX_WITH_VMSVGA3D
   VBoxDD_SOURCES        += \
@@ -306 +307 @@
         $(VBOX_DEF_2_LAZY_LOAD) --explicit-load-function --library VBoxSVGA3DObjC --output "$@" $(filter %.def, $^)
 
-   VBoxDD_LIBS.linux    += GL X11
+   VBoxDD_LIBS.linux    += X11
+   ifdef VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD
+   VBoxDD_DEFS          += VMSVGA3D_DYNAMIC_LOAD
+   VBoxDD_SOURCES       += \
+        Graphics/DevVGA-SVGA3d-glLdr.cpp
+   else
+   VBoxDD_LIBS.linux    += GL
    VBoxDD_LIBS.win      += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
+   endif
    VBoxDD_LDFLAGS.darwin += -framework OpenGL
    VBoxDD_DEFS.darwin    += VBOX_VMSVGA3D_DUAL_OPENGL_PROFILE