VirtualBox

Changeset 64269 in vbox


Ignore:
Timestamp:
Oct 14, 2016 6:03:39 AM (9 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
Files:
22 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r64149 r64269  
    23812381 # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
    23822382  VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
    2383   VBOX_MESA_INCS = \
    2384         $(VBOX_PATH_MESA_SOURCE) \
    2385         $(VBOX_PATH_MESA_SOURCE)/include \
    2386         $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
    2387         $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
    2388         $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
    2389         $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
     2383  VBOX_GL_INCS = \
     2384        $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
     2385        $(VBOX_PATH_X11_ROOT)/mesa-7.2
    23902386 endif
    23912387

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

    r62521 r64269  
    7979        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    8080        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
    81         $(VBOX_MESA_INCS) \
     81        $(VBOX_GL_INCS) \
    8282        $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
    8383 VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
    … …  
    446446if1of ($(KBUILD_TARGET), linux solaris freebsd)
    447447 VBoxOGLarrayspu_INCS += \
    448         $(VBOX_MESA_INCS)
     448        $(VBOX_GL_INCS)
    449449endif
    450450if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    … …  
    494494if1of ($(KBUILD_TARGET), linux solaris freebsd)
    495495 VBoxOGLpassthroughspu_INCS += \
    496         $(VBOX_MESA_INCS)
     496        $(VBOX_GL_INCS)
    497497endif
    498498if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    … …  
    543543if1of ($(KBUILD_TARGET), linux solaris freebsd)
    544544 VBoxOGLpackspu_INCS += \
    545         $(VBOX_MESA_INCS)
     545        $(VBOX_GL_INCS)
    546546endif
    547547if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    … …  
    649649if1of ($(KBUILD_TARGET), linux solaris freebsd)
    650650 VBoxOGLfeedbackspu_INCS += \
    651         $(VBOX_MESA_INCS)
     651        $(VBOX_GL_INCS)
    652652endif
    653653if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)

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

    r18881 r64269  
    33
    44$ mkdir $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
    5 $ for i in `find include src/mesa -name '*.h' | grep -v src/mesa/drivers` \
    6            `find src/mesa/drivers/dri/common -name '*.h'`
    7     do
    8       cp --parents $i $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
    9     done
     5$ cp -r include/GL $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
    106
    117in the mesa-7.2 directory.

  • trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

    r62492 r64269  
    5555if1of ($(KBUILD_TARGET), linux solaris freebsd)
    5656 VBoxOGLcrutil_INCS += \
    57         $(VBOX_MESA_INCS)
     57        $(VBOX_GL_INCS)
    5858endif
    5959VBoxOGLcrutil_SOURCES       = \
    … …  
    200200if1of ($(KBUILD_TARGET), linux solaris freebsd)
    201201 VBoxOGLcrpacker_INCS += \
    202         $(VBOX_MESA_INCS)
     202        $(VBOX_GL_INCS)
    203203endif
    204204VBoxOGLcrpacker_INTERMEDIATES = \
    … …  
    351351if1of ($(KBUILD_TARGET), linux solaris freebsd)
    352352 VBoxOGLspuload_INCS += \
    353         $(VBOX_MESA_INCS)
     353        $(VBOX_GL_INCS)
    354354endif
    355355VBoxOGLspuload_SOURCES = \
    … …  
    424424if1of ($(KBUILD_TARGET), linux solaris freebsd)
    425425 VBoxOGLcrstate_INCS += \
    426         $(VBOX_MESA_INCS)
     426        $(VBOX_GL_INCS)
    427427endif
    428428VBoxOGLcrstate_INTERMEDIATES = \
    … …  
    625625if1of ($(KBUILD_TARGET), linux solaris freebsd)
    626626 VBoxOGLerrorspu_INCS += \
    627         $(VBOX_MESA_INCS)
     627        $(VBOX_GL_INCS)
    628628endif
    629629VBoxOGLerrorspu_SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette