diff --git a/configs/autoconf.in b/configs/autoconf.in index d493d64f80f..58767273884 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -58,6 +58,10 @@ INSTALL = @INSTALL@ PYTHON2 = @PYTHON2@ PYTHON_FLAGS = -t -O -O +# Flex and Bison for GLSL compiler +FLEX = @FLEX@ +BISON = @BISON@ + # Library names (base name) GL_LIB = GL GLU_LIB = GLU diff --git a/configs/default b/configs/default index 0582a0210af..b7acfd2f1a5 100644 --- a/configs/default +++ b/configs/default @@ -38,6 +38,8 @@ MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend MAKE = make +FLEX = flex +BISON = bison # Use MINSTALL for installing libraries, INSTALL for everything else MINSTALL = $(SHELL) $(TOP)/bin/minstall diff --git a/configure.ac b/configure.ac index e7eca3ce453..03f26847c19 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,12 @@ if test "x$MKDEP" = "x"; then AC_MSG_ERROR([makedepend is required to build Mesa]) fi +AC_PATH_PROG([FLEX], [flex]) +test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build Mesa]) + +AC_PATH_PROG([BISON], [bison]) +test "x$BISON" = "x" && AC_MSG_ERROR([bison is needed to build Mesa]) + dnl Our fallback install-sh is a symlink to minstall. Use the existing dnl configuration in that case. AC_PROG_INSTALL @@ -1186,7 +1192,7 @@ if test "x$enable_egl" = xno; then fi if test "x$enable_egl" = xyes; then SRC_DIRS="$SRC_DIRS egl" - EGL_LIB_DEPS="$DLOPEN_LIBS -lpthread" + EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS -lpthread" EGL_DRIVERS_DIRS="" if test "$enable_static" != yes; then # build egl_glx when libGL is built @@ -1602,7 +1608,7 @@ x*yes*) esac if test "x$enable_openvg" = xyes; then EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)' - VG_LIB_DEPS="$VG_LIB_DEPS -lpthread" + VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS -lpthread" fi AC_SUBST([VG_LIB_DEPS]) diff --git a/docs/relnotes-7.11.html b/docs/relnotes-7.11.html index f2ff9c7c587..aaeabc25288 100644 --- a/docs/relnotes-7.11.html +++ b/docs/relnotes-7.11.html @@ -52,6 +52,7 @@ tbd
  • GL_EXT_packed_float (gallium r600)
  • GL_EXT_texture_compression_latc (gallium drivers, swrast)
  • GL_EXT_texture_compression_rgtc (gallium drivers, swrast, i965) +
  • GL_EXT_texture_filter_anisotropic (swrast)
  • GL_EXT_texture_shared_exponent (gallium drivers, swrast)
  • GL_EXT_texture_sRGB_decode (gallium drivers, swrast, i965)
  • GL_EXT_texture_snorm (gallium drivers) diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index 9811b280299..d2be66ccc2b 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -81,6 +81,11 @@ const int i965_chip_ids[] = { 0x0116, /* PCI_CHIP_SANDYBRIDGE_M_GT2 */ 0x0122, /* PCI_CHIP_SANDYBRIDGE_GT2_PLUS */ 0x0126, /* PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS */ + 0x0152, /* PCI_CHIP_IVYBRIDGE_GT1 */ + 0x0162, /* PCI_CHIP_IVYBRIDGE_GT2 */ + 0x0156, /* PCI_CHIP_IVYBRIDGE_M_GT1 */ + 0x0166, /* PCI_CHIP_IVYBRIDGE_M_GT2 */ + 0x015a, /* PCI_CHIP_IVYBRIDGE_S_GT1 */ 0x29a2, /* PCI_CHIP_I965_G */ 0x2992, /* PCI_CHIP_I965_Q */ 0x2982, /* PCI_CHIP_I965_G_1 */ diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index cb8f0551293..6c4a392760f 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -61,11 +61,12 @@ LOCAL_LIBS += $(TOP)/src/egl/drivers/dri2/libegl_dri2.a ifneq ($(findstring x11, $(EGL_PLATFORMS)),) EGL_LIB_DEPS += $(XCB_DRI2_LIBS) endif +EGL_LIB_DEPS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) $(WAYLAND_LIBS) +endif + ifneq ($(findstring wayland, $(EGL_PLATFORMS)),) LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a endif -EGL_LIB_DEPS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) $(WAYLAND_LIBS) -endif ifeq ($(filter glx, $(EGL_DRIVERS_DIRS)),glx) LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX diff --git a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml index cd5d191227a..0331f124e80 100644 --- a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml +++ b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml @@ -3,6 +3,12 @@ + + + + + +