qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge Mesa 13.0.5

Browse Source
This commit is contained in:
jsg 2017-02-26 12:28:55 +00:00
parent ba80afc3a0
commit f9668bb900
55 changed files with 200 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mesa/Makefile.in
View File

@ -502,7 +502,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-vdpau \
--enable-xa \
--enable-xvmc \
--disable-llvm-shared-libs \
--enable-llvm-shared-libs \
--with-egl-platforms=x11,wayland,drm,surfaceless \
--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
--with-gallium-drivers=i915,ilo,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,swr \

222
lib/mesa/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Mesa 13.0.3.
# Generated by GNU Autoconf 2.69 for Mesa 13.0.5.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa>.
#
@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Mesa'
PACKAGE_TARNAME='mesa'
PACKAGE_VERSION='13.0.3'
PACKAGE_STRING='Mesa 13.0.3'
PACKAGE_VERSION='13.0.5'
PACKAGE_STRING='Mesa 13.0.5'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa'
PACKAGE_URL=''
@ -877,10 +877,10 @@ DRI3PROTO_LIBS
DRI3PROTO_CFLAGS
DRI2PROTO_LIBS
DRI2PROTO_CFLAGS
GLPROTO_LIBS
GLPROTO_CFLAGS
XLIBGL_LIBS
XLIBGL_CFLAGS
GLPROTO_LIBS
GLPROTO_CFLAGS
ENABLE_SHADER_CACHE_FALSE
ENABLE_SHADER_CACHE_TRUE
SHA1_CFLAGS
@ -1228,10 +1228,10 @@ LIBSHA1_CFLAGS
LIBSHA1_LIBS
OPENSSL_CFLAGS
OPENSSL_LIBS
XLIBGL_CFLAGS
XLIBGL_LIBS
GLPROTO_CFLAGS
GLPROTO_LIBS
XLIBGL_CFLAGS
XLIBGL_LIBS
DRI2PROTO_CFLAGS
DRI2PROTO_LIBS
DRI3PROTO_CFLAGS
@ -1822,7 +1822,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Mesa 13.0.3 to adapt to many kinds of systems.
\`configure' configures Mesa 13.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1893,7 +1893,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Mesa 13.0.3:";;
short | recursive ) echo "Configuration of Mesa 13.0.5:";;
esac
cat <<\_ACEOF
@ -2000,8 +2000,8 @@ Optional Packages:
comma delimited classic DRI drivers list, e.g.
"swrast,i965,radeon" [default=auto]
--with-vulkan-drivers[=DIRS...]
comma delimited Vulkan drivers list, e.g. "intel"
[default=no]
comma delimited Vulkan drivers list, e.g.
"intel,radeon" [default=no]
--with-vulkan-icddir=DIR
directory for the Vulkan driver icd files
[${datarootdir}/vulkan/icd.d]
@ -2068,13 +2068,13 @@ Some influential environment variables:
C compiler flags for OPENSSL, overriding pkg-config
OPENSSL_LIBS
linker flags for OPENSSL, overriding pkg-config
XLIBGL_CFLAGS
C compiler flags for XLIBGL, overriding pkg-config
XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config
GLPROTO_CFLAGS
C compiler flags for GLPROTO, overriding pkg-config
GLPROTO_LIBS
linker flags for GLPROTO, overriding pkg-config
XLIBGL_CFLAGS
C compiler flags for XLIBGL, overriding pkg-config
XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config
DRI2PROTO_CFLAGS
C compiler flags for DRI2PROTO, overriding pkg-config
DRI2PROTO_LIBS
@ -2227,7 +2227,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Mesa configure 13.0.3
Mesa configure 13.0.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2946,7 +2946,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Mesa $as_me 13.0.3, which was
It was created by Mesa $as_me 13.0.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3882,7 +3882,7 @@ fi
# Define the identity of the package.
PACKAGE='mesa'
VERSION='13.0.3'
VERSION='13.0.5'
cat >>confdefs.h <<_ACEOF
@ -22375,6 +22375,99 @@ else
fi
if test "x$enable_glx" != xno; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLPROTO" >&5
$as_echo_n "checking for GLPROTO... " >&6; }
if test -n "$GLPROTO_CFLAGS"; then
pkg_cv_GLPROTO_CFLAGS="$GLPROTO_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glproto >= \$GLPROTO_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "glproto >= $GLPROTO_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GLPROTO_CFLAGS=`$PKG_CONFIG --cflags "glproto >= $GLPROTO_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$GLPROTO_LIBS"; then
pkg_cv_GLPROTO_LIBS="$GLPROTO_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glproto >= \$GLPROTO_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "glproto >= $GLPROTO_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GLPROTO_LIBS=`$PKG_CONFIG --libs "glproto >= $GLPROTO_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
GLPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glproto >= $GLPROTO_REQUIRED" 2>&1`
else
GLPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glproto >= $GLPROTO_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLPROTO_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (glproto >= $GLPROTO_REQUIRED) were not met:
$GLPROTO_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables GLPROTO_CFLAGS
and GLPROTO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables GLPROTO_CFLAGS
and GLPROTO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
GLPROTO_CFLAGS=$pkg_cv_GLPROTO_CFLAGS
GLPROTO_LIBS=$pkg_cv_GLPROTO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
fi
case "x$enable_glx" in
xxlib | xgallium-xlib)
# Xlib-based GLX
@ -22479,97 +22572,6 @@ fi
xdri)
# DRI-based GLX
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLPROTO" >&5
$as_echo_n "checking for GLPROTO... " >&6; }
if test -n "$GLPROTO_CFLAGS"; then
pkg_cv_GLPROTO_CFLAGS="$GLPROTO_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glproto >= \$GLPROTO_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "glproto >= $GLPROTO_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GLPROTO_CFLAGS=`$PKG_CONFIG --cflags "glproto >= $GLPROTO_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$GLPROTO_LIBS"; then
pkg_cv_GLPROTO_LIBS="$GLPROTO_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glproto >= \$GLPROTO_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "glproto >= $GLPROTO_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GLPROTO_LIBS=`$PKG_CONFIG --libs "glproto >= $GLPROTO_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
GLPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glproto >= $GLPROTO_REQUIRED" 2>&1`
else
GLPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glproto >= $GLPROTO_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLPROTO_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (glproto >= $GLPROTO_REQUIRED) were not met:
$GLPROTO_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables GLPROTO_CFLAGS
and GLPROTO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables GLPROTO_CFLAGS
and GLPROTO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
GLPROTO_CFLAGS=$pkg_cv_GLPROTO_CFLAGS
GLPROTO_LIBS=$pkg_cv_GLPROTO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
# find the DRI deps for libGL
dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
@ -28661,7 +28663,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Mesa $as_me 13.0.3, which was
This file was extended by Mesa $as_me 13.0.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -28718,7 +28720,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Mesa config.status 13.0.3
Mesa config.status 13.0.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

6
lib/mesa/configure.ac
View File

@ -1381,6 +1381,9 @@ AC_ARG_ENABLE([driglx-direct],
dnl
dnl libGL configuration per driver
dnl
if test "x$enable_glx" != xno; then
PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
fi
case "x$enable_glx" in
xxlib | xgallium-xlib)
# Xlib-based GLX
@ -1394,7 +1397,6 @@ xxlib | xgallium-xlib)
;;
xdri)
# DRI-based GLX
PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
# find the DRI deps for libGL
dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
@ -1652,7 +1654,7 @@ fi
AC_ARG_WITH([vulkan-drivers],
[AS_HELP_STRING([--with-vulkan-drivers@<:@=DIRS...@:>@],
[comma delimited Vulkan drivers list, e.g.
"intel"
"intel,radeon"
@<:@default=no@:>@])],
[with_vulkan_drivers="$withval"],
[with_vulkan_drivers="no"])

2
lib/mesa/include/CL/cl_d3d10.h
View File

@ -21,7 +21,7 @@
* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
**********************************************************************************/
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
#ifndef __OPENCL_CL_D3D10_H
#define __OPENCL_CL_D3D10_H

2
lib/mesa/include/CL/cl_d3d11.h
View File

@ -21,7 +21,7 @@
* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
**********************************************************************************/
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
#ifndef __OPENCL_CL_D3D11_H
#define __OPENCL_CL_D3D11_H

2
lib/mesa/include/CL/cl_dx9_media_sharing.h
View File

@ -21,7 +21,7 @@
* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
**********************************************************************************/
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
#ifndef __OPENCL_CL_DX9_MEDIA_SHARING_H
#define __OPENCL_CL_DX9_MEDIA_SHARING_H

2
lib/mesa/include/CL/cl_ext.h
View File

@ -21,7 +21,7 @@
* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
******************************************************************************/
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
/* cl_ext.h contains OpenCL extensions which don't have external */
/* (OpenGL, D3D) dependencies. */

2
lib/mesa/include/CL/cl_gl_ext.h
View File

@ -21,7 +21,7 @@
* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
**********************************************************************************/
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
/* cl_gl_ext.h contains vendor (non-KHR) OpenCL extensions which have */
/* OpenGL dependencies. */

2
lib/mesa/include/CL/cl_platform.h
View File

@ -21,7 +21,7 @@
* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
**********************************************************************************/
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
#ifndef __CL_PLATFORM_H
#define __CL_PLATFORM_H

2
lib/mesa/include/CL/opencl.h
View File

@ -21,7 +21,7 @@
* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
******************************************************************************/
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
#ifndef __OPENCL_H
#define __OPENCL_H

2
lib/mesa/include/EGL/egl.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#include <EGL/eglplatform.h>

2
lib/mesa/include/EGL/eglext.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#include <EGL/eglplatform.h>

2
lib/mesa/include/EGL/eglplatform.h
View File

@ -25,7 +25,7 @@
*/
/* Platform-specific types and definitions for egl.h
* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*
* Adopters may modify khrplatform.h and this file to suit their platform.
* You are encouraged to submit all modifications to the Khronos group so that

2
lib/mesa/include/GL/glcorearb.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

2
lib/mesa/include/GL/glext.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

2
lib/mesa/include/GL/glxext.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#define GLX_GLXEXT_VERSION 20160531

2
lib/mesa/include/GL/wglext.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)

2
lib/mesa/include/GLES/egl.h
View File

@ -3,7 +3,7 @@
* applications. Several early implementations included gl.h
* in egl.h leading applications to include only egl.h
*
* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#ifndef __legacy_egl_h_

2
lib/mesa/include/GLES/gl.h
View File

@ -1,7 +1,7 @@
#ifndef __gl_h_
#define __gl_h_
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
#include <GLES/glplatform.h>

2
lib/mesa/include/GLES/glext.h
View File

@ -1,7 +1,7 @@
#ifndef __glext_h_
#define __glext_h_
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
#ifdef __cplusplus
extern "C" {

2
lib/mesa/include/GLES/glplatform.h
View File

@ -1,7 +1,7 @@
#ifndef __glplatform_h_
#define __glplatform_h_
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
/*
* This document is licensed under the SGI Free Software B License Version

2
lib/mesa/include/GLES2/gl2.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#include <GLES2/gl2platform.h>

2
lib/mesa/include/GLES2/gl2ext.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#ifndef GL_APIENTRYP

2
lib/mesa/include/GLES2/gl2platform.h
View File

@ -1,7 +1,7 @@
#ifndef __gl2platform_h_
#define __gl2platform_h_
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
/*
* This document is licensed under the SGI Free Software B License Version

2
lib/mesa/include/GLES3/gl3.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#include <GLES3/gl3platform.h>

2
lib/mesa/include/GLES3/gl31.h
View File

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
** Khronos $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
** Khronos $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*/
#include <GLES3/gl3platform.h>

2
lib/mesa/include/GLES3/gl3ext.h
View File

@ -1,7 +1,7 @@
#ifndef __gl3ext_h_
#define __gl3ext_h_
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
/*
* This document is licensed under the SGI Free Software B License Version

2
lib/mesa/include/GLES3/gl3platform.h
View File

@ -1,7 +1,7 @@
#ifndef __gl3platform_h_
#define __gl3platform_h_
/* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $ */
/* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $ */
/*
* This document is licensed under the SGI Free Software B License Version

2
lib/mesa/include/KHR/khrplatform.h
View File

@ -26,7 +26,7 @@
/* Khronos platform-specific types and definitions.
*
* $Revision: 1.4 $ on $Date: 2017/01/19 05:53:24 $
* $Revision: 1.5 $ on $Date: 2017/02/26 12:28:56 $
*
* Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos

7
lib/mesa/src/amd/vulkan/Makefile.in
View File

@ -667,8 +667,7 @@ vulkan_include_HEADERS = \
lib_LTLIBRARIES = libvulkan_radeon.la
# The gallium includes are for the util/u_math.h include from main/macros.h
AM_CPPFLAGS = $(AMDGPU_CFLAGS) $(VALGRIND_CFLAGS) $(DEFINES) \
-I$(top_srcdir)/include -I$(top_builddir)/src \
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/src \
-I$(top_srcdir)/src -I$(top_srcdir)/src/vulkan/wsi \
-I$(top_srcdir)/src/amd -I$(top_srcdir)/src/amd/common \
-I$(top_builddir)/src/compiler \
@ -677,8 +676,8 @@ AM_CPPFLAGS = $(AMDGPU_CFLAGS) $(VALGRIND_CFLAGS) $(DEFINES) \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/include $(am__append_1) \
$(am__append_4)
-I$(top_srcdir)/src/gallium/include $(AMDGPU_CFLAGS) \
$(VALGRIND_CFLAGS) $(DEFINES) $(am__append_1) $(am__append_4)
AM_CFLAGS = \
$(VISIBILITY_CFLAGS) \
$(PTHREAD_CFLAGS) \

1
lib/mesa/src/compiler/Makefile.glsl.am
View File

@ -69,6 +69,7 @@ glsl_tests_cache_test_LDADD = \
$(PTHREAD_LIBS)
glsl_tests_general_ir_test_SOURCES = \
glsl/tests/array_refcount_test.cpp \
glsl/tests/builtin_variable_test.cpp \
glsl/tests/invalidate_locations_test.cpp \
glsl/tests/general_ir_test.cpp \

17
lib/mesa/src/compiler/Makefile.in
View File

@ -180,7 +180,8 @@ am__glsl_libglsl_la_SOURCES_DIST = glsl/ir_expression_operation.h \
glsl/glsl_parser_extras.cpp glsl/glsl_parser_extras.h \
glsl/glsl_symbol_table.cpp glsl/glsl_symbol_table.h \
glsl/glsl_to_nir.cpp glsl/glsl_to_nir.h \
glsl/hir_field_selection.cpp glsl/ir_basic_block.cpp \
glsl/hir_field_selection.cpp glsl/ir_array_refcount.cpp \
glsl/ir_array_refcount.h glsl/ir_basic_block.cpp \
glsl/ir_basic_block.h glsl/ir_builder.cpp glsl/ir_builder.h \
glsl/ir_clone.cpp glsl/ir_constant_expression.cpp glsl/ir.cpp \
glsl/ir.h glsl/ir_equals.cpp glsl/ir_expression_flattening.cpp \
@ -244,8 +245,8 @@ am__objects_3 = glsl/ast_array_index.lo glsl/ast_expr.lo \
glsl/blob.lo glsl/builtin_functions.lo glsl/builtin_types.lo \
glsl/builtin_variables.lo glsl/glsl_parser_extras.lo \
glsl/glsl_symbol_table.lo glsl/glsl_to_nir.lo \
glsl/hir_field_selection.lo glsl/ir_basic_block.lo \
glsl/ir_builder.lo glsl/ir_clone.lo \
glsl/hir_field_selection.lo glsl/ir_array_refcount.lo \
glsl/ir_basic_block.lo glsl/ir_builder.lo glsl/ir_clone.lo \
glsl/ir_constant_expression.lo glsl/ir.lo glsl/ir_equals.lo \
glsl/ir_expression_flattening.lo \
glsl/ir_function_can_inline.lo \
@ -375,6 +376,7 @@ glsl_tests_cache_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(glsl_tests_cache_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am_glsl_tests_general_ir_test_OBJECTS = \
glsl/tests/array_refcount_test.$(OBJEXT) \
glsl/tests/builtin_variable_test.$(OBJEXT) \
glsl/tests/invalidate_locations_test.$(OBJEXT) \
glsl/tests/general_ir_test.$(OBJEXT) \
@ -830,6 +832,8 @@ LIBGLSL_FILES = \
glsl/glsl_to_nir.cpp \
glsl/glsl_to_nir.h \
glsl/hir_field_selection.cpp \
glsl/ir_array_refcount.cpp \
glsl/ir_array_refcount.h \
glsl/ir_basic_block.cpp \
glsl/ir_basic_block.h \
glsl/ir_builder.cpp \
@ -1147,6 +1151,7 @@ glsl_tests_cache_test_LDADD = \
$(PTHREAD_LIBS)
glsl_tests_general_ir_test_SOURCES = \
glsl/tests/array_refcount_test.cpp \
glsl/tests/builtin_variable_test.cpp \
glsl/tests/invalidate_locations_test.cpp \
glsl/tests/general_ir_test.cpp \
@ -1404,6 +1409,8 @@ glsl/glsl_to_nir.lo: glsl/$(am__dirstamp) \
glsl/$(DEPDIR)/$(am__dirstamp)
glsl/hir_field_selection.lo: glsl/$(am__dirstamp) \
glsl/$(DEPDIR)/$(am__dirstamp)
glsl/ir_array_refcount.lo: glsl/$(am__dirstamp) \
glsl/$(DEPDIR)/$(am__dirstamp)
glsl/ir_basic_block.lo: glsl/$(am__dirstamp) \
glsl/$(DEPDIR)/$(am__dirstamp)
glsl/ir_builder.lo: glsl/$(am__dirstamp) \
@ -1777,6 +1784,8 @@ glsl/tests/glsl_tests_cache_test-cache_test.$(OBJEXT): \
glsl/tests/cache-test$(EXEEXT): $(glsl_tests_cache_test_OBJECTS) $(glsl_tests_cache_test_DEPENDENCIES) $(EXTRA_glsl_tests_cache_test_DEPENDENCIES) glsl/tests/$(am__dirstamp)
@rm -f glsl/tests/cache-test$(EXEEXT)
$(AM_V_CCLD)$(glsl_tests_cache_test_LINK) $(glsl_tests_cache_test_OBJECTS) $(glsl_tests_cache_test_LDADD) $(LIBS)
glsl/tests/array_refcount_test.$(OBJEXT): glsl/tests/$(am__dirstamp) \
glsl/tests/$(DEPDIR)/$(am__dirstamp)
glsl/tests/builtin_variable_test.$(OBJEXT): \
glsl/tests/$(am__dirstamp) \
glsl/tests/$(DEPDIR)/$(am__dirstamp)
@ -1866,6 +1875,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/glsl_to_nir.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/hir_field_selection.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_array_refcount.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_basic_block.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_builder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_clone.Plo@am__quote@
@ -1959,6 +1969,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@glsl/glcpp/$(DEPDIR)/glcpp-parse.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/glcpp/$(DEPDIR)/glcpp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/glcpp/$(DEPDIR)/pp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/array_refcount_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/blob_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/builtin_variable_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/copy_constant_to_storage_tests.Po@am__quote@

2
lib/mesa/src/egl/Makefile.in
View File

@ -107,8 +107,8 @@ DIST_COMMON = $(egl_HEADERS) $(khr_HEADERS) $(srcdir)/Makefile.am \
@HAVE_EGL_DRIVER_DRI2_TRUE@ -I$(top_srcdir)/src/egl/drivers/dri2 \
@HAVE_EGL_DRIVER_DRI2_TRUE@ -I$(top_srcdir)/src/gbm/backends/dri \
@HAVE_EGL_DRIVER_DRI2_TRUE@ -I$(top_srcdir)/src/egl/wayland/wayland-egl \
@HAVE_EGL_DRIVER_DRI2_TRUE@ -I$(top_srcdir)/src/egl/wayland/wayland-drm \
@HAVE_EGL_DRIVER_DRI2_TRUE@ -I$(top_builddir)/src/egl/wayland/wayland-drm \
@HAVE_EGL_DRIVER_DRI2_TRUE@ -I$(top_srcdir)/src/egl/wayland/wayland-drm \
@HAVE_EGL_DRIVER_DRI2_TRUE@ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
@HAVE_EGL_DRIVER_DRI2_TRUE@ -D_EGL_BUILT_IN_DRIVER_DRI2

2
lib/mesa/src/gallium/drivers/freedreno/Makefile.in
View File

@ -711,6 +711,7 @@ AM_CFLAGS = \
$(GALLIUM_DRIVER_CFLAGS) \
$(FREEDRENO_CFLAGS)
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
noinst_LTLIBRARIES = libfreedreno.la
libfreedreno_la_SOURCES = \
$(C_SOURCES) \
@ -1274,7 +1275,6 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am
ir3/ir3_nir_trig.c: ir3/ir3_nir_trig.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
$(MKDIR_GEN)
$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py > $@ || ($(RM) $@; false)

7
lib/mesa/src/gallium/state_trackers/clover/Makefile.in
View File

@ -588,12 +588,11 @@ TGSI_SOURCES := \
tgsi/compiler.cpp \
tgsi/invocation.hpp
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-I$(top_srcdir)/src/gallium/include \
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/src \
-I$(top_srcdir)/src -I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/winsys -I$(top_builddir)/src \
-I$(srcdir) $(am__append_1)
-I$(top_srcdir)/src/gallium/winsys -I$(srcdir) $(am__append_1)
# Only install the headers if we are building a stand-alone implementation
@HAVE_CLOVER_ICD_FALSE@cldir = $(includedir)/CL
@HAVE_CLOVER_ICD_FALSE@cl_HEADERS = \

5
lib/mesa/src/gallium/state_trackers/dri/Makefile.in
View File

@ -553,10 +553,9 @@ GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
$(am__append_1) $(am__append_2)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(GALLIUM_CFLAGS) $(LIBDRM_CFLAGS) $(VISIBILITY_CFLAGS) \
$(am__append_3)
-I$(top_srcdir)/src/mesa/drivers/dri/common $(GALLIUM_CFLAGS) \
$(LIBDRM_CFLAGS) $(VISIBILITY_CFLAGS) $(am__append_3)
noinst_LTLIBRARIES = libdri.la
libdri_la_SOURCES = $(common_SOURCES) $(am__append_4) $(am__append_5)
EXTRA_DIST = SConscript

1
lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.in
View File

@ -531,6 +531,7 @@ GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
$(am__append_1) $(am__append_2)
AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
$(GLPROTO_CFLAGS) \
$(X11_INCLUDES)
AM_CPPFLAGS = \

2
lib/mesa/src/gallium/targets/d3dadapter9/Makefile.in
View File

@ -719,8 +719,8 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/loader \
-I$(top_srcdir)/src/mapi/ \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_builddir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/gallium/winsys \
-I$(top_srcdir)/src/gallium/state_trackers/nine \
$(GALLIUM_TARGET_CFLAGS) \

2
lib/mesa/src/getopt/getopt.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: getopt.h,v 1.4 2017/01/19 05:53:24 jsg Exp $ */
/* $OpenBSD: getopt.h,v 1.5 2017/02/26 12:28:56 jsg Exp $ */
/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */
/*-

2
lib/mesa/src/getopt/getopt_long.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: getopt_long.c,v 1.4 2017/01/19 05:53:24 jsg Exp $ */
/* $OpenBSD: getopt_long.c,v 1.5 2017/02/26 12:28:56 jsg Exp $ */
/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
/*

4
lib/mesa/src/glx/Makefile.am
View File

@ -37,10 +37,10 @@ AM_CFLAGS = \
-I$(top_srcdir)/include/GL/internal \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/loader \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mapi/glapi \
-I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mapi \
-I$(top_builddir)/src/mapi/glapi \
-I$(top_srcdir)/src/mapi/glapi \
$(VISIBILITY_CFLAGS) \
$(SHARED_GLAPI_CFLAGS) \
$(EXTRA_DEFINES_XF86VIDMODE) \

6
lib/mesa/src/glx/Makefile.in
View File

@ -626,9 +626,9 @@ EXTRA_DIST = SConscript
@HAVE_XF86VIDMODE_TRUE@EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
AM_CFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/include/GL/internal -I$(top_srcdir)/src \
-I$(top_srcdir)/src/loader -I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mapi/glapi -I$(top_builddir)/src/mapi \
-I$(top_builddir)/src/mapi/glapi $(VISIBILITY_CFLAGS) \
-I$(top_srcdir)/src/loader -I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mapi -I$(top_builddir)/src/mapi/glapi \
-I$(top_srcdir)/src/mapi/glapi $(VISIBILITY_CFLAGS) \
$(SHARED_GLAPI_CFLAGS) $(EXTRA_DEFINES_XF86VIDMODE) \
-D_REENTRANT -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
$(DEFINES) $(LIBDRM_CFLAGS) $(DRI2PROTO_CFLAGS) \

4
lib/mesa/src/glx/apple/Makefile.in
View File

@ -436,11 +436,11 @@ AM_CFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/glx \
-I$(top_srcdir)/src/mesa \
-I$(top_builddir)/src/mesa \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mapi/glapi \
-I$(top_builddir)/src/mapi/glapi \
-I$(top_srcdir)/src/mapi/glapi \
$(VISIBILITY_CFLAGS) \
$(SHARED_GLAPI_CFLAGS) \
$(DEFINES) \

2
lib/mesa/src/glx/windows/Makefile.in
View File

@ -489,8 +489,8 @@ libwindowsglx_la_CFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/glx \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mapi/glapi \
-I$(top_builddir)/src/mapi/glapi \
-I$(top_srcdir)/src/mapi/glapi \
$(VISIBILITY_CFLAGS) \
$(SHARED_GLAPI_CFLAGS) \
$(DEFINES) \

2
lib/mesa/src/loader/Makefile.in
View File

@ -75,8 +75,8 @@ target_triplet = @target@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.sources $(top_srcdir)/bin/depcomp
@HAVE_DRICOMMON_TRUE@am__append_1 = \
@HAVE_DRICOMMON_TRUE@ -I$(top_srcdir)/src/mesa/drivers/dri/common/ \
@HAVE_DRICOMMON_TRUE@ -I$(top_builddir)/src/mesa/drivers/dri/common/ \
@HAVE_DRICOMMON_TRUE@ -I$(top_srcdir)/src/mesa/drivers/dri/common/ \
@HAVE_DRICOMMON_TRUE@ -I$(top_srcdir)/src/mesa/ \
@HAVE_DRICOMMON_TRUE@ -I$(top_srcdir)/src/mapi/ \
@HAVE_DRICOMMON_TRUE@ -DUSE_DRICONF

4
lib/mesa/src/mapi/Makefile.am
View File

@ -46,8 +46,8 @@ AM_CPPFLAGS = \
$(SELINUX_CFLAGS) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi \
-I$(top_builddir)/src/mapi
-I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mapi
include Makefile.sources

4
lib/mesa/src/mapi/Makefile.in
View File

@ -742,8 +742,8 @@ AM_CPPFLAGS = \
$(SELINUX_CFLAGS) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi \
-I$(top_builddir)/src/mapi
-I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mapi
MAPI_UTIL_FILES = \
u_current.c \

2
lib/mesa/src/mesa/drivers/dri/i915/Makefile.in
View File

@ -529,9 +529,9 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
$(INTEL_CFLAGS)

7
lib/mesa/src/mesa/drivers/dri/i965/Makefile.am
View File

@ -30,21 +30,22 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
-I$(top_srcdir)/src/gtest/include \
-I$(top_srcdir)/src/compiler/nir \
-I$(top_srcdir)/src/intel \
-I$(top_builddir)/src/compiler/glsl \
-I$(top_builddir)/src/compiler/nir \
-I$(top_srcdir)/src/compiler/nir \
-I$(top_builddir)/src/intel \
-I$(top_builddir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/intel \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
$(INTEL_CFLAGS)
AM_CXXFLAGS = $(AM_CFLAGS)
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
if REGEN_SOURCES
brw_nir_trig_workarounds.c: brw_nir_trig_workarounds.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
$(MKDIR_GEN)

8
lib/mesa/src/mesa/drivers/dri/i965/Makefile.in
View File

@ -944,20 +944,21 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
-I$(top_srcdir)/src/gtest/include \
-I$(top_srcdir)/src/compiler/nir \
-I$(top_srcdir)/src/intel \
-I$(top_builddir)/src/compiler/glsl \
-I$(top_builddir)/src/compiler/nir \
-I$(top_srcdir)/src/compiler/nir \
-I$(top_builddir)/src/intel \
-I$(top_builddir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/intel \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
$(INTEL_CFLAGS)
AM_CXXFLAGS = $(AM_CFLAGS)
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
I965_PERGEN_LIBS = \
libi965_gen6.la \
libi965_gen7.la \
@ -1774,7 +1775,6 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
@REGEN_SOURCES_TRUE@brw_nir_trig_workarounds.c: brw_nir_trig_workarounds.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_nir_trig_workarounds.py > $@ || ($(RM) $@; false)

2
lib/mesa/src/mesa/drivers/dri/r200/Makefile.in
View File

@ -525,9 +525,9 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
$(RADEON_CFLAGS)

2
lib/mesa/src/mesa/drivers/dri/radeon/Makefile.in
View File

@ -525,9 +525,9 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
$(RADEON_CFLAGS)

2
lib/mesa/src/mesa/drivers/dri/swrast/Makefile.in
View File

@ -459,8 +459,8 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_builddir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
$(LIBDRM_CFLAGS) \
$(DEFINES) \
$(VISIBILITY_CFLAGS)

2
lib/mesa/src/mesa/drivers/osmesa/Makefile.in
View File

@ -509,8 +509,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/mapi \
-I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
$(DEFINES)

4
lib/mesa/src/mesa/main/tests/Makefile.in
View File

@ -455,8 +455,8 @@ AM_CFLAGS = \
$(PTHREAD_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/gtest/include -I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi -I$(top_srcdir)/src/mesa \
-I$(top_builddir)/src/mesa -I$(top_srcdir)/include $(DEFINES) \
-I$(top_srcdir)/src/mapi -I$(top_builddir)/src/mesa \
-I$(top_srcdir)/src/mesa -I$(top_srcdir)/include $(DEFINES) \
$(INCLUDE_DIRS) $(am__append_1)
main_test_SOURCES = enum_strings.cpp $(am__append_2) $(am__append_4)
main_test_LDADD = $(top_builddir)/src/mesa/libmesa.la \