Changeset 84725 in vbox

Timestamp:

Jun 8, 2020 3:58:30 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Graphics: glLdr: load more functions.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-glLdr.cpp (modified) (10 diffs)
• DevVGA-SVGA3d-glLdr.h (modified) (11 diffs)

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

@@ -191 +191 @@
     pfn_XCloseDisplay = 0;
     pfn_XCreateColormap = 0;
+    pfn_XCreatePixmap = 0;
     pfn_XCreateWindow = 0;
     pfn_XDefaultRootWindow = 0;
     pfn_XDestroyWindow = 0;
+    pfn_XFree = 0;
+    pfn_XFreePixmap = 0;
     pfn_XInitThreads = 0;
     pfn_XNextEvent = 0;
     pfn_XOpenDisplay = 0;
     pfn_XPending = 0;
+    pfn_XSetErrorHandler = 0;
+    pfn_XSync = 0;
+    pfn_glXGetFBConfigAttrib = 0;
+    pfn_glXGetVisualFromFBConfig = 0;
     pfn_glXQueryVersion = 0;
+    pfn_glXChooseFBConfig = 0;
     pfn_glXChooseVisual = 0;
     pfn_glXCreateContext = 0;
+    pfn_glXCreatePixmap = 0;
     pfn_glXMakeCurrent = 0;
     pfn_glXDestroyContext = 0;
+    pfn_glXDestroyPixmap = 0;
 #endif
     pfn_glAlphaFunc = 0;
+    pfn_glBegin = 0;
     pfn_glBindTexture = 0;
     pfn_glBlendColor = 0;
@@ -228 +239 @@
     pfn_glEnable = 0;
     pfn_glEnableClientState = 0;
+    pfn_glEnd = 0;
+    pfn_glFinish = 0;
+    pfn_glFlush = 0;
     pfn_glFogf = 0;
     pfn_glFogfv = 0;
@@ -249 +263 @@
     pfn_glMultMatrixf = 0;
     pfn_glNormalPointer = 0;
+    pfn_glOrtho = 0;
     pfn_glPixelStorei = 0;
     pfn_glPointSize = 0;
@@ -262 +277 @@
     pfn_glStencilMask = 0;
     pfn_glStencilOp = 0;
+    pfn_glTexCoord2f = 0;
     pfn_glTexCoordPointer = 0;
     pfn_glTexImage2D = 0;
@@ -268 +284 @@
     pfn_glTexParameteri = 0;
     pfn_glTexSubImage2D = 0;
+    pfn_glVertex2i = 0;
     pfn_glVertexPointer = 0;
     pfn_glViewport = 0;
@@ -281 +298 @@
     X11GETPROC_(XCloseDisplay);
     X11GETPROC_(XCreateColormap);
+    X11GETPROC_(XCreatePixmap);
     X11GETPROC_(XCreateWindow);
     X11GETPROC_(XDefaultRootWindow);
     X11GETPROC_(XDestroyWindow);
+    X11GETPROC_(XFree);
+    X11GETPROC_(XFreePixmap);
     X11GETPROC_(XInitThreads);
     X11GETPROC_(XNextEvent);
     X11GETPROC_(XOpenDisplay);
     X11GETPROC_(XPending);
+    X11GETPROC_(XSetErrorHandler);
+    X11GETPROC_(XSync);
+    GLGETPROC_(glXGetFBConfigAttrib, "");
+    GLGETPROC_(glXGetVisualFromFBConfig, "");
     GLGETPROC_(glXQueryVersion, "");
+    GLGETPROC_(glXChooseFBConfig, "");
     GLGETPROC_(glXChooseVisual, "");
     GLGETPROC_(glXCreateContext, "");
+    GLGETPROC_(glXCreatePixmap, "");
     GLGETPROC_(glXMakeCurrent, "");
     GLGETPROC_(glXDestroyContext, "");
+    GLGETPROC_(glXDestroyPixmap, "");
 #endif
     GLGETPROC_(glAlphaFunc, "");
+    GLGETPROC_(glBegin, "");
     GLGETPROC_(glBindTexture, "");
     GLGETPROC_(glBlendFunc, "");
@@ -315 +343 @@
     GLGETPROC_(glEnable, "");
     GLGETPROC_(glEnableClientState, "");
+    GLGETPROC_(glEnd, "");
+    GLGETPROC_(glFinish, "");
+    GLGETPROC_(glFlush, "");
     GLGETPROC_(glFogf, "");
     GLGETPROC_(glFogfv, "");
@@ -336 +367 @@
     GLGETPROC_(glMultMatrixf, "");
     GLGETPROC_(glNormalPointer, "");
+    GLGETPROC_(glOrtho, "");
     GLGETPROC_(glPixelStorei, "");
     GLGETPROC_(glPointSize, "");
@@ -349 +381 @@
     GLGETPROC_(glStencilMask, "");
     GLGETPROC_(glStencilOp, "");
+    GLGETPROC_(glTexCoord2f, "");
     GLGETPROC_(glTexCoordPointer, "");
     GLGETPROC_(glTexImage2D, "");
@@ -355 +388 @@
     GLGETPROC_(glTexParameteri, "");
     GLGETPROC_(glTexSubImage2D, "");
+    GLGETPROC_(glVertex2i, "");
     GLGETPROC_(glVertexPointer, "");
     GLGETPROC_(glViewport, "");

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

@@ -104 +104 @@
 #define glAlphaFunc pfn_glAlphaFunc
 
+GLPFN void (GLAPIENTRYP pfn_glBegin)(GLenum mode);
+#define glBegin pfn_glBegin
+
 GLPFN void (GLAPIENTRYP pfn_glBindTexture)(GLenum target, GLuint texture);
 #define glBindTexture pfn_glBindTexture
@@ -164 +167 @@
 #define glEnableClientState pfn_glEnableClientState
 
+GLPFN void (GLAPIENTRYP pfn_glEnd)(void);
+#define glEnd pfn_glEnd
+
+GLPFN void (GLAPIENTRYP pfn_glFinish)(void);
+#define glFinish pfn_glFinish
+
+GLPFN void (GLAPIENTRYP pfn_glFlush)(void);
+#define glFlush pfn_glFlush
+
 GLPFN void (GLAPIENTRYP pfn_glFogf)(GLenum pname, GLfloat param);
 #define glFogf pfn_glFogf
@@ -227 +239 @@
 #define glNormalPointer pfn_glNormalPointer
 
+GLPFN void (GLAPIENTRYP pfn_glOrtho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble nearVal, GLdouble farVal);
+#define glOrtho pfn_glOrtho
+ 
 GLPFN void (GLAPIENTRYP pfn_glPixelStorei)(GLenum pname, GLint param);
 #define glPixelStorei pfn_glPixelStorei
@@ -266 +281 @@
 #define glStencilOp pfn_glStencilOp
 
+GLPFN void (GLAPIENTRYP pfn_glTexCoord2f)(GLfloat s, GLfloat t);
+#define glTexCoord2f pfn_glTexCoord2f
+
 GLPFN void (GLAPIENTRYP pfn_glTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const void *pointer);
 #define glTexCoordPointer pfn_glTexCoordPointer
@@ -284 +302 @@
 #define glTexSubImage2D pfn_glTexSubImage2D
 
+GLPFN void (GLAPIENTRYP pfn_glVertex2i)(GLint x, GLint y);
+#define glVertex2i pfn_glVertex2i
+
 GLPFN void (GLAPIENTRYP pfn_glVertexPointer)(GLint size, GLenum type, GLsizei stride, const void *pointer);
 #define glVertexPointer pfn_glVertexPointer
@@ -322 +343 @@
  * GLX
  */
+GLPFN int (* pfn_glXGetFBConfigAttrib)(Display * dpy, GLXFBConfig config, int attribute, int * value);
+#define glXGetFBConfigAttrib pfn_glXGetFBConfigAttrib
+
+GLPFN XVisualInfo * (* pfn_glXGetVisualFromFBConfig)(Display * dpy, GLXFBConfig config);
+#define glXGetVisualFromFBConfig pfn_glXGetVisualFromFBConfig
+
 GLPFN Bool (* pfn_glXQueryVersion)(Display * dpy,  int * major,  int * minor);
 #define glXQueryVersion pfn_glXQueryVersion
 
+GLPFN GLXFBConfig * (* pfn_glXChooseFBConfig)(Display * dpy, int screen, const int * attrib_list, int * nelements);
+#define glXChooseFBConfig pfn_glXChooseFBConfig
+
 GLPFN XVisualInfo* (* pfn_glXChooseVisual)(Display * dpy,  int screen,  int * attribList);
 #define glXChooseVisual pfn_glXChooseVisual
@@ -331 +361 @@
 #define glXCreateContext pfn_glXCreateContext
 
+GLPFN GLXPixmap (* pfn_glXCreatePixmap)(Display * dpy, GLXFBConfig config, Pixmap pixmap, const int * attrib_list);
+#define glXCreatePixmap pfn_glXCreatePixmap
+
 GLPFN Bool (* pfn_glXMakeCurrent)(Display * dpy,  GLXDrawable drawable,  GLXContext ctx);
 #define glXMakeCurrent pfn_glXMakeCurrent
@@ -337 +370 @@
 #define glXDestroyContext pfn_glXDestroyContext
 
+GLPFN void (* pfn_glXDestroyPixmap)(Display * dpy, GLXPixmap Pixmap);
+#define glXDestroyPixmap pfn_glXDestroyPixmap
+
 /*
  * X11
@@ -348 +384 @@
 GLPFN Colormap (* pfn_XCreateColormap)(Display *display, Window w, Visual *visual, int alloc);
 #define XCreateColormap pfn_XCreateColormap
+
+GLPFN Pixmap (* pfn_XCreatePixmap)(Display *display, Drawable d, unsigned int width, unsigned int height, unsigned int depth);
+#define XCreatePixmap pfn_XCreatePixmap
 
 GLPFN Window (* pfn_XCreateWindow)(Display *display, Window parent, int x, int y, unsigned int width, unsigned int height,
@@ -359 +398 @@
 #define XDestroyWindow pfn_XDestroyWindow
 
+GLPFN int (* pfn_XFree)(void *data);
+#define XFree pfn_XFree
+
+GLPFN int (* pfn_XFreePixmap)(Display *display, Pixmap pixmap);
+#define XFreePixmap pfn_XFreePixmap
+
 GLPFN Status (* pfn_XInitThreads)(void);
 #define XInitThreads pfn_XInitThreads
@@ -371 +416 @@
 #define XPending pfn_XPending
 
+GLPFN int (* (* pfn_XSetErrorHandler)(int (*handler)(Display *, XErrorEvent *)))(Display *, XErrorEvent *);
+#define XSetErrorHandler pfn_XSetErrorHandler
+
+GLPFN int (* pfn_XSync)(Display *display, Bool discard);
+#define XSync pfn_XSync
+
 #endif