Changeset 18547 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 30, 2009 1:38:04 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: comment 2 unused functions and glxim isn't pointer

File:

• trunk/src/VBox/Additions/common/crOpenGL/glx_c_exports.c (modified) (14 diffs)

trunk/src/VBox/Additions/common/crOpenGL/glx_c_exports.c

@@ -27 +27 @@
 
 #ifdef VBOXOGL_FAKEDRI
-void VBOXGLXENTRYTAG(glXGetDriverConfig)(const char *driverName)
-{
-    return glxim->GetDriverConfig(driverName);
-}
+/*void VBOXGLXENTRYTAG(glXGetDriverConfig)(const char *driverName)
+{
+    return glxim.GetDriverConfig(driverName);
+}*/
 
 void VBOXGLXENTRYTAG(glXFreeMemoryMESA)(Display *dpy, int scrn, void *pointer)
 {
-    return glxim->FreeMemoryMESA(dpy, scrn, pointer);
+    return glxim.FreeMemoryMESA(dpy, scrn, pointer);
 }
 
 GLXContext VBOXGLXENTRYTAG(glXImportContextEXT)(Display *dpy, GLXContextID contextID)
 {
-    return glxim->ImportContextEXT(dpy, contextID);
+    return glxim.ImportContextEXT(dpy, contextID);
 }
 
 GLXContextID VBOXGLXENTRYTAG(glXGetContextIDEXT)(const GLXContext ctx)
 {
-    return glxim->GetContextIDEXT(ctx);
+    return glxim.GetContextIDEXT(ctx);
 }
 
 Bool VBOXGLXENTRYTAG(glXMakeCurrentReadSGI)(Display *display, GLXDrawable draw, GLXDrawable read, GLXContext ctx)
 {
-    return glxim->MakeCurrentReadSGI(display, draw, read, ctx);
-}
-
-
-const char * VBOXGLXENTRYTAG(glXGetScreenDriver)(Display *dpy, int scrNum)
-{
-    return glxim->GetScreenDriver(dpy, scrNum);
-}
+    return glxim.MakeCurrentReadSGI(display, draw, read, ctx);
+}
+
+
+/*const char * VBOXGLXENTRYTAG(glXGetScreenDriver)(Display *dpy, int scrNum)
+{
+    return glxim.GetScreenDriver(dpy, scrNum);
+}*/
 
 
 Display * VBOXGLXENTRYTAG(glXGetCurrentDisplayEXT)(void)
 {
-    return glxim->GetCurrentDisplayEXT();
+    return glxim.GetCurrentDisplayEXT();
 }
 
 void VBOXGLXENTRYTAG(glXFreeContextEXT)(Display *dpy, GLXContext ctx)
 {
-    return glxim->FreeContextEXT(dpy, ctx);
+    return glxim.FreeContextEXT(dpy, ctx);
 }
 
@@ -72 +72 @@
 int VBOXGLXENTRYTAG(glXQueryContextInfoEXT)(Display *dpy, GLXContext ctx)
 {
-    return glxim->QueryContextInfoEXT(dpy, ctx);
+    return glxim.QueryContextInfoEXT(dpy, ctx);
 }
 
@@ -79 +79 @@
                                                        float writeFreq, float priority);
 {
-    return glxim->AllocateMemoryMESA(dpy, scrn, size, readFreq, writeFreq, priority);
+    return glxim.AllocateMemoryMESA(dpy, scrn, size, readFreq, writeFreq, priority);
 }
 
 GLuint VBOXGLXENTRYTAG(glXGetMemoryOffsetMESA)(Display *dpy, int scrn, const void *pointer )
 {
-    return glxim->GetMemoryOffsetMESA(dpy, scr, pointer);
+    return glxim.GetMemoryOffsetMESA(dpy, scr, pointer);
 }
 
@@ -90 +90 @@
 GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmapMESA)(Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap)
 {
-    return glxim->CreateGLXPixmapMESA(dpy, visual, pixmap, cmap);
+    return glxim.CreateGLXPixmapMESA(dpy, visual, pixmap, cmap);
 }
 #endif
@@ -102 +102 @@
 #endif
 {
-    return glxim->CopyContext(dpy,. src, dst, mask);
+    return glxim.CopyContext(dpy,. src, dst, mask);
 }
 
@@ -108 +108 @@
 void VBOXGLXENTRYTAG(glXUseXFont)(Font font, int first, int count, int listBase)
 {
-    return glxim->UseXFont(font, first, count, listBase);
+    return glxim.UseXFont(font, first, count, listBase);
 }
 
 CR_GLXFuncPtr VBOXGLXENTRYTAG(glXGetProcAddress)(const GLubyte *name)
 {
-    return glxim->GetProcAddress(name);
+    return glxim.GetProcAddress(name);
 }
 
 Bool VBOXGLXENTRYTAG(glXQueryExtension)(Display *dpy, int *errorBase, int *eventBase)
 {
-    return glxim->QueryExtension(dpy, errorBase, eventBase);
+    return glxim.QueryExtension(dpy, errorBase, eventBase);
 }
 
 Bool VBOXGLXENTRYTAG(glXIsDirect)(Display *dpy, GLXContext ctx)
 {
-    return glxim->IsDirect(dpy, ctx);
+    return glxim.IsDirect(dpy, ctx);
 }
 
 GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmap)(Display *dpy, XVisualInfo *vis, Pixmap pixmap)
 {
-    return glxim->CreateGLXPixmap(dpy, vis, pixmap);
+    return glxim.CreateGLXPixmap(dpy, vis, pixmap);
 }
 
 void VBOXGLXENTRYTAG(glXSwapBuffers)(Display *dpy, GLXDrawable drawable)
 {
-    return glxim->SwapBuffers(dpy, drawable);
+    return glxim.SwapBuffers(dpy, drawable);
 }
 
@@ -139 +139 @@
 GLXDrawable VBOXGLXENTRYTAG(glXGetCurrentDrawable)(void)
 {
-    return glxim->GetCurrentDrawable();
+    return glxim.GetCurrentDrawable();
 }
 
 void VBOXGLXENTRYTAG(glXWaitGL)(void)
 {
-    return glxim->WaitGL();
+    return glxim.WaitGL();
 }
 
 Display * VBOXGLXENTRYTAG(glXGetCurrentDisplay)(void)
 {
-    return glxim->GetCurrentDisplay();
+    return glxim.GetCurrentDisplay();
 }
 
 const char * VBOXGLXENTRYTAG(glXQueryServerString)(Display *dpy, int screen, int name)
 {
-    return glxim->QueryServerString(dpy, screen, name);
+    return glxim.QueryServerString(dpy, screen, name);
 }
 
 GLXContext VBOXGLXENTRYTAG(glXCreateContext)(Display *dpy, XVisualInfo *vis, GLXContext share, Bool direct)
 {
-    return glxim->CreateContext(dpy, vis, share, direct);
+    return glxim.CreateContext(dpy, vis, share, direct);
 }
 
 int VBOXGLXENTRYTAG(glXGetConfig)(Display *dpy, XVisualInfo *vis, int attrib, int *value)
 {
-    return glxim->GetConfig(dpy, vis, attrib, value);
+    return glxim.GetConfig(dpy, vis, attrib, value);
 }
 
 void VBOXGLXENTRYTAG(glXWaitX)(void)
 {
-    return glxim->WaitX();
+    return glxim.WaitX();
 }
 
 GLXContext VBOXGLXENTRYTAG(glXGetCurrentContext)(void)
 {
-    return glxim->GetCurrentContext();
+    return glxim.GetCurrentContext();
 }
 
 const char * VBOXGLXENTRYTAG(glXGetClientString)(Display *dpy, int name)
 {
-    return glxim->GetClientString(dpy, name);
+    return glxim.GetClientString(dpy, name);
 }
 
 Bool VBOXGLXENTRYTAG(glXMakeCurrent)(Display *dpy, GLXDrawable drawable, GLXContext ctx)
 {
-    return glxim->MakeCurrent(dpy, drawable, ctx);
+    return glxim.MakeCurrent(dpy, drawable, ctx);
 }
 
 void VBOXGLXENTRYTAG(glXDestroyContext)(Display *dpy, GLXContext ctx)
 {
-    return glxim->DestroyContext(dpy, ctx);
+    return glxim.DestroyContext(dpy, ctx);
 }
 
 CR_GLXFuncPtr VBOXGLXENTRYTAG(glXGetProcAddressARB)(const GLubyte *name)
 {
-    return glxim->GetProcAddressARB(name);
+    return glxim.GetProcAddressARB(name);
 }
 
 void VBOXGLXENTRYTAG(glXDestroyGLXPixmap)(Display *dpy, GLXPixmap pix)
 {
-    return glxim->DestroyGLXPixmap(dpy, pix);
+    return glxim.DestroyGLXPixmap(dpy, pix);
 }
 
 Bool VBOXGLXENTRYTAG(glXQueryVersion)(Display *dpy, int *major, int *minor)
 {
-    return glxim->QueryVersion(dpy, major, minor);
+    return glxim.QueryVersion(dpy, major, minor);
 }
 
 XVisualInfo * VBOXGLXENTRYTAG(glXChooseVisual)(Display *dpy, int screen, int *attribList)
 {
-    return glxim->ChooseVisual(dpy, screen, attribList);
+    return glxim.ChooseVisual(dpy, screen, attribList);
 }
 
 const char * VBOXGLXENTRYTAG(glXQueryExtensionsString)(Display *dpy, int screen)
 {
-    return glxim->QueryExtensionsString(dpy, screen);
+    return glxim.QueryExtensionsString(dpy, screen);
 }
 
@@ -221 +221 @@
 (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list)
 {
-    return glxim->CreateGLXPbufferSGIX(dpy, config, width, height, attrib_list);
+    return glxim.CreateGLXPbufferSGIX(dpy, config, width, height, attrib_list);
 }
 
@@ -227 +227 @@
 (Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value)
 {
-    return glxim->QueryGLXPbufferSGIX(dpy, pbuf, attribute, value);
+    return glxim.QueryGLXPbufferSGIX(dpy, pbuf, attribute, value);
 }
 
@@ -233 +233 @@
 (Display *dpy, int screen, int *attrib_list, int *nelements)
 {
-    return glxim->ChooseFBConfigSGIX(dpy, screen, attrib_list, nelements);
+    return glxim.ChooseFBConfigSGIX(dpy, screen, attrib_list, nelements);
 }
 
 void VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf)
 {
-    return glxim->DestroyGLXPbufferSGIX(dpy, pbuf);
+    return glxim.DestroyGLXPbufferSGIX(dpy, pbuf);
 }
 
 void VBOXGLXENTRYTAG(glXSelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask)
 {
-    return glxim->SelectEventSGIX(dpy, drawable, mask);
+    return glxim.SelectEventSGIX(dpy, drawable, mask);
 }
 
 void VBOXGLXENTRYTAG(glXGetSelectedEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long *mask)
 {
-    return glxim->GetSelectedEventSGIX(dpy, drawable, mask);
+    return glxim.GetSelectedEventSGIX(dpy, drawable, mask);
 }
 
 GLXFBConfigSGIX VBOXGLXENTRYTAG(glXGetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis)
 {
-    return glxim->GetFBConfigFromVisualSGIX(dpy, vis);
+    return glxim.GetFBConfigFromVisualSGIX(dpy, vis);
 }
 
 XVisualInfo * VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config)
 {
-    return glxim->GetVisualFromFBConfigSGIX(dpy, config);
+    return glxim.GetVisualFromFBConfigSGIX(dpy, config);
 }
 
@@ -264 +264 @@
 (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct)
 {
-    return glxim->CreateContextWithConfigSGIX(dpy, config, render_type, share_list, direct);
+    return glxim.CreateContextWithConfigSGIX(dpy, config, render_type, share_list, direct);
 }
 
 GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap)
 {
-    return glxim->CreateGLXPixmapWithConfigSGIX(dpy, config, pixmap);
+    return glxim.CreateGLXPixmapWithConfigSGIX(dpy, config, pixmap);
 }
 
 int VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value)
 {
-    return glxim->GetFBConfigAttribSGIX(dpy, config, attribute, value);
+    return glxim.GetFBConfigAttribSGIX(dpy, config, attribute, value);
 }
 
@@ -283 +283 @@
 GLXFBConfig * VBOXGLXENTRYTAG(glXChooseFBConfig)(Display *dpy, int screen, ATTRIB_TYPE *attrib_list, int *nelements)
 {
-    return glxim->ChooseFBConfig(dpy, screen, attrib_list, nelements);
+    return glxim.ChooseFBConfig(dpy, screen, attrib_list, nelements);
 }
 
 GLXPbuffer VBOXGLXENTRYTAG(glXCreatePbuffer)(Display *dpy, GLXFBConfig config, ATTRIB_TYPE *attrib_list)
 {
-    return glxim->CreatePbuffer(dpy, config, attrib_list);
+    return glxim.CreatePbuffer(dpy, config, attrib_list);
 }
 
 GLXPixmap VBOXGLXENTRYTAG(glXCreatePixmap)(Display *dpy, GLXFBConfig config, Pixmap pixmap, const ATTRIB_TYPE *attrib_list)
 {
-    return glxim->CreatePixmap(dpy, config, pixmap, attrib_list);
+    return glxim.CreatePixmap(dpy, config, pixmap, attrib_list);
 }
 
 GLXWindow VBOXGLXENTRYTAG(glXCreateWindow)(Display *dpy, GLXFBConfig config, Window win, ATTRIB_TYPE *attrib_list)
 {
-    return glxim->CreateWindow(dpy, config, win, attrib_list);
+    return glxim.CreateWindow(dpy, config, win, attrib_list);
 }
 
@@ -305 +305 @@
 (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct)
 {
-    return glxim->CreateNewContext(dpy, config, render_type, share_list, direct);
+    return glxim.CreateNewContext(dpy, config, render_type, share_list, direct);
 }
 
 void VBOXGLXENTRYTAG(glXDestroyPbuffer)(Display *dpy, GLXPbuffer pbuf)
 {
-    return glxim->DestroyPbuffer(dpy, pbuf);
+    return glxim.DestroyPbuffer(dpy, pbuf);
 }
 
 void VBOXGLXENTRYTAG(glXDestroyPixmap)(Display *dpy, GLXPixmap pixmap)
 {
-    return glxim->DestroyPixmap(dpy, pixmap);
+    return glxim.DestroyPixmap(dpy, pixmap);
 }
 
 void VBOXGLXENTRYTAG(glXDestroyWindow)(Display *dpy, GLXWindow win)
 {
-    return glxim->DestroyWindow(dpy, win);
+    return glxim.DestroyWindow(dpy, win);
 }
 
 GLXDrawable VBOXGLXENTRYTAG(glXGetCurrentReadDrawable)(void)
 {
-    return glxim->GetCurrentReadDrawable();
+    return glxim.GetCurrentReadDrawable();
 }
 
 int VBOXGLXENTRYTAG(glXGetFBConfigAttrib)(Display *dpy, GLXFBConfig config, int attribute, int *value)
 {
-    return glxim->GetFBConfigAttrib(dp, config, attribute, value);
+    return glxim.GetFBConfigAttrib(dp, config, attribute, value);
 }
 
 GLXFBConfig * VBOXGLXENTRYTAG(glXGetFBConfigs)(Display *dpy, int screen, int *nelements)
 {
-    return glxim->GetFBConfigs(dpy, screen, nelements);
+    return glxim.GetFBConfigs(dpy, screen, nelements);
 }
 
 void VBOXGLXENTRYTAG(glXGetSelectedEvent)(Display *dpy, GLXDrawable draw, unsigned long *event_mask)
 {
-    return glxim->GetSelectedEvent(dpy, draw, event_mask);
+    return glxim.GetSelectedEvent(dpy, draw, event_mask);
 }
 
 XVisualInfo * VBOXGLXENTRYTAG(glXGetVisualFromFBConfig)(Display *dpy, GLXFBConfig config)
 {
-    return glxim->GetVisualFromFBConfig(dpy, config);
+    return glxim.GetVisualFromFBConfig(dpy, config);
 }
 
 Bool VBOXGLXENTRYTAG(glXMakeContextCurrent)(Display *display, GLXDrawable draw, GLXDrawable read, GLXContext ctx)
 {
-    return glxim->MakeContextCurrent(disaply, draw, read, ctx);
+    return glxim.MakeContextCurrent(disaply, draw, read, ctx);
 }
 
 int VBOXGLXENTRYTAG(glXQueryContext)(Display *dpy, GLXContext ctx, int attribute, int *value)
 {
-    return glxim->QueryContext(dpy, ctx, attribute, value);
+    return glxim.QueryContext(dpy, ctx, attribute, value);
 }
 
 void VBOXGLXENTRYTAG(glXQueryDrawable)(Display *dpy, GLXDrawable draw, int attribute, unsigned int *value)
 {
-    return glxim->QueryDrawable(dpy, draw, attribute, value);
+    return glxim.QueryDrawable(dpy, draw, attribute, value);
 }
 
 void VBOXGLXENTRYTAG(glXSelectEvent)(Display *dpy, GLXDrawable draw, unsigned long event_mask)
 {
-    return glxim->SelectEvent(dpy, draw, event_mask);
+    return glxim.SelectEvent(dpy, draw, event_mask);
 }
 
@@ -371 +371 @@
 void VBOXGLXENTRYTAG(glXBindTexImageEXT)(Display *dpy, GLXDrawable draw, int buffer, const int *attrib_list)
 {
-    return glxim->BindTexImageEXT(dpy, draw, buffer, attrib_list);
+    return glxim.BindTexImageEXT(dpy, draw, buffer, attrib_list);
 }
 
 void VBOXGLXENTRYTAG(glXReleaseTexImageEXT)(Display *dpy, GLXDrawable draw, int buffer)
 {
-    return glxim->ReleaseTexImageEXT(dpy, draw, buffer);
+    return glxim.ReleaseTexImageEXT(dpy, draw, buffer);
 }
 #endif