Changeset 95751 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jul 20, 2022 11:47:45 AM (3 years ago)

Author:

vboxsync

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

152461

Message:

Devices/Graphics: Switch to new OpenGL headers, bugref:8515

Location:

trunk/src/VBox/Devices/Graphics

Files:

• .scm-settings (modified) (1 diff)
• DevVGA-SVGA3d-glLdr.h (modified) (2 diffs)
• DevVGA-SVGA3d-internal.h (modified) (4 diffs)
• vmsvga_glext (added)
• vmsvga_glext/glext.h (added)
• vmsvga_glext/glxext.h (added)
• vmsvga_glext/khrplatform.h (added)
• vmsvga_glext/wglext.h (added)

trunk/src/VBox/Devices/Graphics/.scm-settings

@@ -69 +69 @@
 
 /vmsvga_glext/*.h: --external-copyright --no-convert-tabs --no-strip-trailing-blanks
+/vmsvga_glext-new/*.h: --external-copyright --no-convert-tabs --no-strip-trailing-blanks
 
 /DevVGATmpl.h:                          --no-fix-header-guards

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

@@ -41 +41 @@
 # define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
 # include <OpenGL/gl.h>
-# include <OpenGL/glext.h>
 # include "DevVGA-SVGA3d-cocoa.h"
 // HACK
@@ -60 +59 @@
 # include <GL/gl.h>
 # include <GL/glx.h>
-# include <GL/glext.h>
 # define VBOX_VMSVGA3D_GL_HACK_LEVEL 0x103
 #endif

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

@@ -62 +62 @@
 # define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
 # include <OpenGL/gl.h>
-# include <OpenGL/glext.h>
 # include "DevVGA-SVGA3d-cocoa.h"
 /* work around conflicting definition of GLhandleARB in VMware's glext.h */
@@ -70 +69 @@
 typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
 typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+# if 0
 # define GL_RGBA_S3TC 0x83A2
 # define GL_ALPHA8_EXT 0x803c
@@ -77 +77 @@
 # define GL_LUMINANCE8_ALPHA8_EXT 0x8045
 # define GL_INT_2_10_10_10_REV 0x8D9F
+# endif
 
 #else
@@ -83 +84 @@
 # include <GL/gl.h>
 # include <GL/glx.h>
-# include <GL/glext.h>
 # define VBOX_VMSVGA3D_GL_HACK_LEVEL 0x103
 #endif
 
 #ifdef VMSVGA3D_OPENGL
+# ifndef __glext_h__
+#  undef GL_GLEXT_VERSION    /** @todo r=bird: We include GL/glext.h above which also defines this and we'll end up with
+                              * a clash if the system one does not use the same header guard as ours.  So, I'm wondering
+                              * whether this include is really needed, and if it is, whether we should use a unique header
+                              * guard macro on it, so we'll have the same problems everywhere... */
+# endif
 # include "vmsvga_glext/glext.h"
 # include "shaderlib/shaderlib.h"