Changeset 16574 in vbox for trunk

Timestamp:

Feb 9, 2009 10:21:16 AM (16 years ago)

Author:

vboxsync

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

42531

Message:

crOpenGL: linux, fixes for compiz to work

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/crOpenGL/getprocaddress.py (modified) (2 diffs)
• Additions/WINNT/Graphics/crOpenGL/stub.h (modified) (1 diff)
• GuestHost/OpenGL/include/cr_version.h (modified) (1 diff)
• GuestHost/OpenGL/include/state/cr_limits.h (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_limits.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/getprocaddress.py

@@ -61 +61 @@
 };
 
+DECLEXPORT(void) glXBindTexImageEXT(Display *dpy, GLXDrawable draw, int buffer, const int *attrib_list);
+DECLEXPORT(void) glXReleaseTexImageEXT(Display *dpy, GLXDrawable draw, int buffer);
+DECLEXPORT(void) glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
+DECLEXPORT(GLXFBConfig *) glXGetFBConfigs(Display *dpy, int screen, int *nelements);
+DECLEXPORT(int) glXGetFBConfigAttrib(Display *dpy, GLXFBConfig config, int attribute, int *value);
+DECLEXPORT(GLXPixmap) glXCreatePixmap(Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
+
+
 CR_PROC CR_APIENTRY crGetProcAddress( const char *name )
 {
@@ -72 +80 @@
         }
 
+    if (!crStrcmp( name, "glXBindTexImageEXT" )) return (CR_PROC) glXBindTexImageEXT;
+    if (!crStrcmp( name, "glXReleaseTexImageEXT" )) return (CR_PROC) glXReleaseTexImageEXT;
+    if (!crStrcmp( name, "glXQueryDrawable" )) return (CR_PROC) glXQueryDrawable;
+    if (!crStrcmp( name, "glXGetFBConfigs" )) return (CR_PROC) glXGetFBConfigs;
+    if (!crStrcmp( name, "glXGetFBConfigAttrib" )) return (CR_PROC) glXGetFBConfigAttrib;
+    if (!crStrcmp( name, "glXCreatePixmap" )) return (CR_PROC) glXCreatePixmap;
+
+    if (name) crDebug("Returning NULL for %s", name);
         return NULL;
 }

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/stub.h

@@ -33 +33 @@
 
 #include "chromium.h"
+#include "cr_version.h"
 #include "cr_hash.h"
 #include "cr_process.h"

trunk/src/VBox/GuestHost/OpenGL/include/cr_version.h

@@ -105 +105 @@
 #define CR_SGIS_generate_mipmap 1
 
+#define CR_EXT_texture_from_pixmap 1
+
 #endif /* CR_VERSION_H */

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_limits.h

@@ -257 +257 @@
         GLboolean NV_vertex_program2;
         GLboolean SGIS_generate_mipmap;
+    GLboolean EXT_texture_from_pixmap;
 
         /* derived from above */

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_limits.c

@@ +1 @@
+
 /* Copyright (c) 2001, Stanford University
  * All rights reserved
@@ -388 +389 @@
         if (hasExtension((const char*)limits->extensions, "GL_SGIS_generate_mipmap"))
                 extensions->SGIS_generate_mipmap = GL_TRUE;
+
+        if (hasExtension((const char*)limits->extensions, "GLX_EXT_texture_from_pixmap"))
+                extensions->EXT_texture_from_pixmap = GL_TRUE;
 
         if (extensions->NV_vertex_program2)