Changeset 76255 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 16, 2018 6:47:05 PM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d: Use PDMDevHlpVMSetError and VERR_VGA_GL_SYMBOL_NOT_FOUND to report errors loading open gl symbol resolving errors. Tested on windows. Left todo (mainly to myself) about better libGL.so/opengl32.dll/OpenGL.dylib loading error reporting, since that'll show up as failure to resolve 'glAlphaFunc' now.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-glLdr.cpp (modified) (4 diffs)
• DevVGA-SVGA3d-glLdr.h (modified) (2 diffs)
• DevVGA-SVGA3d-internal.h (modified) (1 diff)
• DevVGA-SVGA3d-ogl.cpp (modified) (2 diffs)

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

@@ -19 +19 @@
 #include "DevVGA-SVGA3d-glLdr.h"
 
+#include <VBox/vmm/pdmdev.h>
+#include <VBox/err.h>
 #include <iprt/assert.h>
 #include <iprt/cdefs.h>
-#include <iprt/err.h>
 #include <iprt/ldr.h>
 #include <iprt/log.h>
@@ -126 +127 @@
 
 #define GLGETPROC_(ProcName, NameSuffix) do { \
-    *(PFNRT *)&pfn_##ProcName = OGLGETPROCADDRESS(#ProcName NameSuffix); \
-    AssertLogRelMsgReturn(pfn_##ProcName, ("%s missing\n", #ProcName NameSuffix), VERR_NOT_IMPLEMENTED); \
+    *(PFNRT *)&pfn_##ProcName = pfnRet = OGLGETPROCADDRESS(#ProcName NameSuffix); \
+    if (pfnRet) { /* likely */ } \
+    else \
+    { \
+        AssertLogRelMsg(pfnRet, ("%s missing\n", #ProcName NameSuffix)); \
+        return PDMDevHlpVMSetError(pDevIns, VERR_VGA_GL_SYMBOL_NOT_FOUND, RT_SRC_POS, \
+                                   "Missing OpenGL symbol '%s'\n", #ProcName NameSuffix); \
+    } \
 } while(0)
 
-int glLdrInit(void)
-{
+int glLdrInit(PPDMDEVINS pDevIns)
+{
+    /** @todo r=bird: Perhaps make this template include file driven? See
+     * include/VBox/dbus.h, include/VBox/dbus-calls.h and iprt/runtime-loader.h for
+     * instance.  Regardless, it would be would be nice if we could move up the
+     * RTLdrLoadSystem/dlopen bits and have separate error reporting for those,
+     * making use of VERR_VGA_GL_LOAD_FAILURE.  I can look into that, but
+     * probably only after the release is out... */
+
     pfn_glAlphaFunc = 0;
     pfn_glBindTexture = 0;
@@ -211 +225 @@
 #endif
 
+    PFNRT pfnRet;
     GLGETPROC_(glAlphaFunc, "");
     GLGETPROC_(glBindTexture, "");
@@ -294 +309 @@
 }
 
-int glLdrGetExtFunctions(void)
-{
+int glLdrGetExtFunctions(PPDMDEVINS pDevIns)
+{
+    PFNRT pfnRet;
     GLGETPROC_(glBlendColor, "");
     GLGETPROC_(glBlendEquation, "");

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

@@ -23 +23 @@
 #endif
 
-#include <iprt/types.h>
+#include <VBox/types.h>
 
 /** @todo VBOX_VMSVGA3D_GL_HACK_LEVEL is not necessary when dynamic loading is used. */
@@ -78 +78 @@
 #endif
 
-/* Load OpenGL library and initialize function pointers. */
-int glLdrInit(void);
-/* Resolve an OpenGL function name. */
+/** Load OpenGL library and initialize function pointers. */
+int glLdrInit(PPDMDEVINS pDevIns);
+/** Resolve an OpenGL function name. */
 PFNRT glLdrGetProcAddress(const char *pszSymbol);
-/* Get pointers to extension function. They are available on Windows only when OpenGL context is set. */
-int glLdrGetExtFunctions(void);
+/** Get pointers to extension function. They are available on Windows only when OpenGL context is set. */
+int glLdrGetExtFunctions(PPDMDEVINS pDevIns);
 
 /*

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

@@ -40 +40 @@
 
 #if defined(VMSVGA3D_DYNAMIC_LOAD) && defined(VMSVGA3D_OPENGL)
-#include "DevVGA-SVGA3d-glLdr.h"
+# include "DevVGA-SVGA3d-glLdr.h"
 #endif
 

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

@@ -592 +592 @@
 
 #ifdef VMSVGA3D_DYNAMIC_LOAD
-    rc = glLdrInit();
+    rc = glLdrInit(pThis->pDevInsR3);
     if (RT_FAILURE(rc))
     {
@@ -812 +812 @@
 #ifdef VMSVGA3D_DYNAMIC_LOAD
     /* Context is set and it is possible now to resolve extension functions. */
-    rc = glLdrGetExtFunctions();
+    rc = glLdrGetExtFunctions(pThis->pDevInsR3);
     if (RT_FAILURE(rc))
     {