Changeset 76245 in vbox

Timestamp:

Dec 15, 2018 6:18:19 PM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d: more for dynamic loading of opengl

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-glLdr.cpp (modified) (2 diffs)
• DevVGA-SVGA3d-glLdr.h (modified) (5 diffs)

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

@@ -118 +118 @@
 #define GLGETPROC_(ProcName, NameSuffix) do { \
     *(void **)&pfn_##ProcName = OGLGETPROCADDRESS(#ProcName NameSuffix); \
-    AssertLogRelMsgReturn(pfn_##ProcName, (#ProcName NameSuffix " missing\n"), VERR_NOT_IMPLEMENTED); \
+    AssertLogRelMsgReturn(pfn_##ProcName, ("%s missing\n", #ProcName NameSuffix), VERR_NOT_IMPLEMENTED); \
 } while(0)
 
 int glLdrInit(void)
 {
+    pfn_glAlphaFunc = 0;
+    pfn_glBindTexture = 0;
+    pfn_glBlendColor = 0;
+    pfn_glBlendEquation = 0;
+    pfn_glBlendFunc = 0;
+    pfn_glClear = 0;
+    pfn_glClearColor = 0;
+    pfn_glClearDepth = 0;
+    pfn_glClearStencil = 0;
+    pfn_glClientActiveTexture = 0;
+    pfn_glClipPlane = 0;
+    pfn_glColorMask = 0;
+    pfn_glColorPointer = 0;
+    pfn_glCullFace = 0;
+    pfn_glDeleteTextures = 0;
+    pfn_glDepthFunc = 0;
+    pfn_glDepthMask = 0;
+    pfn_glDepthRange = 0;
+    pfn_glDisable = 0;
+    pfn_glDisableClientState = 0;
+    pfn_glDrawArrays = 0;
+    pfn_glDrawElements = 0;
+    pfn_glEnable = 0;
+    pfn_glEnableClientState = 0;
+    pfn_glFogf = 0;
+    pfn_glFogfv = 0;
+    pfn_glFogi = 0;
+    pfn_glFrontFace = 0;
+    pfn_glGenTextures = 0;
+    pfn_glGetBooleanv = 0;
+    pfn_glGetError = 0;
+    pfn_glGetFloatv = 0;
+    pfn_glGetIntegerv = 0;
+    pfn_glGetString = 0;
+    pfn_glGetTexImage = 0;
+    pfn_glLightModelfv = 0;
+    pfn_glLightf = 0;
+    pfn_glLightfv = 0;
+    pfn_glLineWidth = 0;
+    pfn_glLoadIdentity = 0;
+    pfn_glLoadMatrixf = 0;
+    pfn_glMaterialfv = 0;
+    pfn_glMatrixMode = 0;
+    pfn_glMultMatrixf = 0;
+    pfn_glNormalPointer = 0;
+    pfn_glPixelStorei = 0;
+    pfn_glPointSize = 0;
+    pfn_glPolygonMode = 0;
+    pfn_glPolygonOffset = 0;
+    pfn_glPopAttrib = 0;
+    pfn_glPopMatrix = 0;
+    pfn_glPushAttrib = 0;
+    pfn_glPushMatrix = 0;
+    pfn_glScissor = 0;
+    pfn_glShadeModel = 0;
+    pfn_glStencilFunc = 0;
+    pfn_glStencilMask = 0;
+    pfn_glStencilOp = 0;
+    pfn_glTexCoordPointer = 0;
+    pfn_glTexImage2D = 0;
+    pfn_glTexParameterf = 0;
+    pfn_glTexParameterfv = 0;
+    pfn_glTexParameteri = 0;
+    pfn_glTexSubImage2D = 0;
+    pfn_glVertexPointer = 0;
+    pfn_glViewport = 0;
+
     GLGETPROC_(glAlphaFunc, "");
     GLGETPROC_(glBindTexture, "");
@@ -199 +266 @@
     return OGLGETPROCADDRESS(pszSymbol);
 }
+
+int glLdrGetExtFunctions(void)
+{
+    GLGETPROC_(glBlendColor, "");
+    GLGETPROC_(glBlendEquation, "");
+    GLGETPROC_(glClientActiveTexture, "");
+    return VINF_SUCCESS;
+}

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

@@ -22 +22 @@
 # error "This include file is for VMSVGA3D_OPENGL."
 #endif
+
+/** @todo VBOX_VMSVGA3D_GL_HACK_LEVEL is not necessary when dynamic loading is used. */
 
 #ifdef RT_OS_WINDOWS
@@ -62 +64 @@
 #ifdef RT_OS_WINDOWS
 # define GLAPIENTRY APIENTRY
-
 #else
-...
+# define GLAPIENTRY
 #endif
 
@@ -77 +78 @@
 /* Load OpenGL library and initialize function pointers. */
 int glLdrInit(void);
+/* Resolve an OpenGL function name. */
 void *glLdrGetProcAddress(const char *pszSymbol);
+/* Get pointers to extension function. They are available on Windows only when OpenGL context is set. */
+int glLdrGetExtFunctions(void);
 
 /*
@@ -83 +87 @@
  */
 
+/*
+ * GL 1.1 functions (exported from OpenGL32 on Windows).
+ */
 GLPFN void (GLAPIENTRYP pfn_glAlphaFunc)(GLenum func, GLclampf ref);
 #define glAlphaFunc pfn_glAlphaFunc
@@ -272 +279 @@
 #define glViewport pfn_glViewport
 
+/*
+ * Extension functions (not exported from OpenGL32 on Windows).
+ */
+GLPFN void (GLAPIENTRYP pfn_glBlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#define glBlendColor pfn_glBlendColor
+
+GLPFN void (GLAPIENTRYP pfn_glBlendEquation)(GLenum mode);
+#define glBlendEquation pfn_glBlendEquation
+
+GLPFN void (GLAPIENTRYP pfn_glClientActiveTexture)(GLenum texture);
+#define glClientActiveTexture pfn_glClientActiveTexture
+
 #ifdef RT_OS_WINDOWS
+/*
+ * WGL.
+ */
 GLPFN HGLRC (WINAPI *pfn_wglCreateContext)(HDC);
 #define wglCreateContext pfn_wglCreateContext