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

Timestamp:

Oct 14, 2016 6:03:39 AM (8 years ago)

Author:

vboxsync

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

111282

Message:

bugref:3810: X11 Guest Additions maintenance: remove unnecessary parts of the Mesa 7.2 sources from the tree, leaving only public OpenGL header files. The reason we are not just switching to using the Mesa 11 headers is that they currently conflict with our API definitions in APIspec.txt including due to increased const-correctness.

Location:

trunk/src/VBox/Additions

Files:

• common/crOpenGL/Makefile.kmk (modified) (5 diffs)
• x11/x11include/mesa-7.2/GL (added)
• x11/x11include/mesa-7.2/GL/amesa.h (added)
• x11/x11include/mesa-7.2/GL/dmesa.h (added)
• x11/x11include/mesa-7.2/GL/gl.h (added)
• x11/x11include/mesa-7.2/GL/glext.h (added)
• x11/x11include/mesa-7.2/GL/glfbdev.h (added)
• x11/x11include/mesa-7.2/GL/glu.h (added)
• x11/x11include/mesa-7.2/GL/glx.h (added)
• x11/x11include/mesa-7.2/GL/glx_mangle.h (added)
• x11/x11include/mesa-7.2/GL/glxext.h (added)
• x11/x11include/mesa-7.2/GL/internal (added)
• x11/x11include/mesa-7.2/GL/internal/dri_interface.h (added)
• x11/x11include/mesa-7.2/GL/internal/dri_sarea.h (added)
• x11/x11include/mesa-7.2/GL/internal/glcore.h (added)
• x11/x11include/mesa-7.2/GL/internal/sarea.h (added)
• x11/x11include/mesa-7.2/GL/mesa_wgl.h (added)
• x11/x11include/mesa-7.2/GL/miniglx.h (added)
• x11/x11include/mesa-7.2/GL/osmesa.h (added)
• x11/x11include/mesa-7.2/GL/uglmesa.h (added)
• x11/x11include/mesa-7.2/GL/xmesa.h (added)
• x11/x11include/mesa-7.2/GL/xmesa_x.h (added)
• x11/x11include/mesa-7.2/GL/xmesa_xf86.h (added)
• x11/x11include/mesa-7.2/README (modified) (1 diff)
• x11/x11include/mesa-7.2/include (deleted)
• x11/x11include/mesa-7.2/src (deleted)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -79 +79 @@
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-        $(VBOX_MESA_INCS) \
+        $(VBOX_GL_INCS) \
         $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
@@ -446 +446 @@
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGLarrayspu_INCS += \
-        $(VBOX_MESA_INCS)
+        $(VBOX_GL_INCS)
 endif
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
@@ -494 +494 @@
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGLpassthroughspu_INCS += \
-        $(VBOX_MESA_INCS)
+        $(VBOX_GL_INCS)
 endif
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
@@ -543 +543 @@
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGLpackspu_INCS += \
-        $(VBOX_MESA_INCS)
+        $(VBOX_GL_INCS)
 endif
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
@@ -649 +649 @@
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGLfeedbackspu_INCS += \
-        $(VBOX_MESA_INCS)
+        $(VBOX_GL_INCS)
 endif
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)

trunk/src/VBox/Additions/x11/x11include/mesa-7.2/README

@@ -3 +3 @@
 
 $ mkdir $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
-$ for i in `find include src/mesa -name '*.h' | grep -v src/mesa/drivers` \
-           `find src/mesa/drivers/dri/common -name '*.h'`
-    do
-      cp --parents $i $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
-    done
+$ cp -r include/GL $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
 
 in the mesa-7.2 directory.