mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .editorconfig  
  |4 
 .gitignore 
  |2 
 .travis.yml
  |  148 
 Android.common.mk  
  |8 
 Android.mk 
  |8 
 Makefile.am
  |6 
 REVIEWERS  
  |6 
 SConstruct 
  |3 
 VERSION
  |2 
 bin/.cherry-ignore 
  |   73 
 bin/git_sha1_gen.py
  |   36 
 bin/git_sha1_gen.sh
  |   12 
 bin/install_megadrivers.py 
  |   55 
 build-support/conftest.dyn 
  |3 
 build-support/conftest.map 
  |6 
 configure.ac   
  |  364 -
 debian/changelog   
  |8 
 debian/patches/egl-platform-mir.patch  
  |  126 
 debian/patches/i965-disable-l3-cache-alloc-for-ext-buffers.diff
  |  167 
 debian/patches/series  
  |1 
 debian/rules   
  |2 
 docs/egl.html  
  |   10 
 docs/envvars.html  
  |   18 
 docs/features.txt  
  |   75 
 docs/helpwanted.html   
  |   19 
 docs/index.html
  |   55 
 docs/libGL.txt 
  |2 
 docs/llvmpipe.html 
  |   28 
 docs/release-calendar.html 
  |   63 
 docs/releasing.html
  |   22 
 docs/relnotes.html 
  |9 
 docs/relnotes/17.1.10.html 
  |  155 
 docs/relnotes/17.1.6.html  
  |  225 
 docs/relnotes/17.1.7.html  
  |  148 
 docs/relnotes/17.1.8.html  
  |  115 
 docs/relnotes/17.1.9.html  
  |  144 
 docs/relnotes/17.2.4.html  
  |  131 
 docs/relnotes/17.3.0.html  
  |  246 
 docs/relnotes/17.3.1.html  
  |  190 
 docs/shading.html  
  |   21 
 docs/sourcetree.html   
  |2 
 docs/specs/OLD/MESA_program_debug.spec 
  |2 
 docs/specs/enums.txt   
  |   21 
 docs/submittingpatches.html
  |   12 
 include/EGL/eglplatform.h  
  |3 
 include/GL/glcorearb.h 
  |   90 
 include/GL/glext.h 
  |  138 
 include/GL/glxext.h
  |2 
 include/GL/internal/dri_interface.h
  |  147 
 include/GL/mesa_glinterop.h
  |4 
 include/GL/wglext.h
  |2 
 include/GLES2/gl2ext.h 
  |   57 
 include/drm-uapi/README
  |   11 
 include/drm-uapi/drm.h 
  |   22 
 include/drm-uapi/drm_fourcc.h  
  

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .travis.yml  |   15 
 Makefile.am  |1 
 SConstruct   |8 
 VERSION  |2 
 bin/.cherry-ignore   |   50 
 configure.ac |   13 
 debian/changelog |   29 
 debian/control   |3 
 debian/patches/i965-disable-l3-cache-alloc-for-ext-buffers.diff  |  167 +
 debian/patches/series|2 
 debian/patches/vulkan-mir.patch  | 1099 
--
 debian/rules |2 
 docs/relnotes/17.2.1.html|3 
 docs/relnotes/17.2.2.html|  203 +
 docs/relnotes/17.2.3.html|  181 +
 docs/relnotes/17.2.4.html|  131 +
 include/EGL/eglmesaext.h |1 
 scons/gallium.py |   22 
 scons/llvm.py|   37 
 src/SConscript   |2 
 src/amd/addrlib/core/addrobject.cpp  |8 
 src/amd/common/ac_llvm_build.c   |   59 
 src/amd/common/ac_llvm_build.h   |   14 
 src/amd/common/ac_nir_to_llvm.c  |   23 
 src/amd/common/ac_surface.c  |   11 
 src/amd/common/sid.h |2 
 src/amd/vulkan/radv_cmd_buffer.c |7 
 src/amd/vulkan/radv_formats.c|6 
 src/amd/vulkan/radv_pipeline.c   |2 
 src/amd/vulkan/radv_private.h|8 
 src/amd/vulkan/radv_query.c  |4 
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c|2 
 src/compiler/glsl/blob.c |   11 
 src/compiler/glsl/blob.h |6 
 src/compiler/glsl/glsl_to_nir.cpp|2 
 src/compiler/glsl/linker.cpp |   23 
 src/compiler/glsl/lower_instructions.cpp |  167 -
 src/compiler/nir/nir_intrinsics.h|8 
 src/compiler/nir/nir_opcodes.py  |2 
 src/compiler/spirv/spirv_to_nir.c|1 
 src/compiler/spirv/vtn_cfg.c |2 
 src/egl/drivers/dri2/egl_dri2.c  |   12 
 src/egl/drivers/dri2/egl_dri2_fallbacks.h|9 
 src/egl/drivers/dri2/platform_wayland.c  |   68 
 src/egl/drivers/dri2/platform_x11.c  |1 
 src/egl/wayland/wayland-drm/wayland-drm.c|   10 
 src/gallium/auxiliary/gallivm/lp_bld_init.c  |2 
 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp|   60 
 src/gallium/auxiliary/util/u_cpu_detect.c|   32 
 src/gallium/drivers/etnaviv/etnaviv_clear_blit.c |2 
 src/gallium/drivers/freedreno/a5xx/fd5_emit.c|3 
 src/gallium/drivers/freedreno/freedreno_resource.c   |6 
 src/gallium/drivers/llvmpipe/SConscript  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp|4 
 src/gallium/drivers/nouveau/nv50/nv50_push.c |3 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c|9 
 src/gallium/drivers/radeon/r600_pipe_common.c|   11 
 src/gallium/drivers/radeon/r600_pipe_common.h|2 
 src/gallium/drivers/radeon/r600_texture.c|5 
 src/gallium/drivers/radeon/r600_viewport.c   |   21 
 src/gallium/drivers/radeonsi/si_descriptors.c|   31 
 src/gallium/drivers/radeonsi/si_pipe.h   |2 
 src/gallium/drivers/radeonsi/si_shader.c |   20 
 src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c|  161 +
 src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c  |2 
 src/gallium/drivers/radeonsi/si_state.c  |  127 -
 src/gallium/drivers/radeonsi/si_state_draw.c |   24 
 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Android.common.mk |4 
 Android.mk|   12 
 VERSION   |2 
 bin/.cherry-ignore|   20 
 configure.ac  |   45 +
 debian/changelog  |   13 
 debian/control|   10 
 debian/rules  |2 
 docs/egl.html |   21 
 docs/relnotes/17.2.0.html |  154 +++
 docs/relnotes/17.2.1.html |  199 
 include/EGL/egl.h |6 
 include/EGL/eglext.h  |   73 +
 include/KHR/khrplatform.h |   10 
 scons/gallium.py  |   16 
 src/amd/Android.common.mk |4 
 src/amd/common/ac_nir_to_llvm.c   |  132 ++
 src/amd/common/ac_surface.c   |   58 +
 src/amd/vulkan/radv_cmd_buffer.c  |   64 -
 src/amd/vulkan/radv_descriptor_set.c  |1 
 src/amd/vulkan/radv_device.c  |   12 
 src/amd/vulkan/radv_formats.c |4 
 src/amd/vulkan/radv_image.c   |  142 ++-
 src/amd/vulkan/radv_meta_blit.c   |   19 
 src/amd/vulkan/radv_meta_blit2d.c |  206 ++--
 src/amd/vulkan/radv_meta_clear.c  |   17 
 src/amd/vulkan/radv_meta_resolve.c|7 
 src/amd/vulkan/radv_meta_resolve_cs.c |   15 
 src/amd/vulkan/radv_meta_resolve_fs.c |7 
 src/amd/vulkan/radv_pipeline.c|  131 ++
 src/amd/vulkan/radv_pipeline_cache.c  |3 
 src/amd/vulkan/radv_private.h |3 
 src/amd/vulkan/radv_radeon_winsys.h   |3 
 src/amd/vulkan/radv_wsi.c |8 
 src/amd/vulkan/si_cmd_buffer.c|   19 
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c |   36 
 src/compiler/Makefile.sources |4 
 src/compiler/glsl/ast_to_hir.cpp  |2 
 src/compiler/glsl/ir_constant_expression.cpp  |2 
 src/compiler/glsl/link_uniform_initializers.cpp   |2 
 src/compiler/glsl/link_uniforms.cpp   |2 
 src/compiler/glsl/link_varyings.cpp   |3 
 src/compiler/glsl/linker.cpp  |2 
 src/compiler/glsl/opt_constant_propagation.cpp|6 
 src/compiler/glsl/shader_cache.cpp|  176 +++
 src/compiler/glsl/standalone.cpp  |2 
 src/compiler/glsl/string_to_uint_map.cpp  |   42 
 src/compiler/glsl/string_to_uint_map.h|  177 +++
 src/compiler/glsl/tests/set_uniform_initializer_tests.cpp |2 
 src/compiler/nir/nir.c|8 
 src/compiler/shader_info.h|6 
 src/compiler/spirv/vtn_variables.c|5 
 src/egl/drivers/dri2/egl_dri2.c   |   12 
 src/egl/drivers/dri2/platform_wayland.c   |   26 
 src/egl/drivers/dri2/platform_x11.c   |1 
 src/egl/generate/egl.xml  |  626 +-
 src/egl/generate/eglFunctionList.py   |4 
 src/gallium/auxiliary/gallivm/lp_bld_format_soa.c |8 
 src/gallium/auxiliary/gallivm/lp_bld_gather.c |   30 
 src/gallium/auxiliary/os/os_time.c|9 
 src/gallium/drivers/etnaviv/etnaviv_clear_blit.c  |2 
 src/gallium/drivers/freedreno/freedreno_draw.c|8 
 src/gallium/drivers/llvmpipe/lp_context.c |6 
 src/gallium/drivers/nouveau/codegen/nv50_ir.cpp   |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c  |1 
 src/gallium/drivers/radeon/Android.mk |2 
 src/gallium/drivers/radeon/r600_pipe_common.c |1 
 src/gallium/drivers/radeon/r600_pipe_common.h |5 
 src/gallium/drivers/radeon/r600_texture.c |9 
 src/gallium/drivers/radeonsi/Android.mk   |2 
 src/gallium/drivers/radeonsi/si_compute.c |5 
 src/gallium/drivers/radeonsi/si_descriptors.c |   85 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |6 ++
 debian/control   |4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 693ca04e480afe821676f9656c1d029b490f1bd3
Author: Timo Aaltonen 
Date:   Tue Aug 15 15:48:46 2017 +0300

control: limit libxatracker* to x86

diff --git a/debian/changelog b/debian/changelog
index e6dce05..fe8f905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (17.2.0~rc4-0ubuntu3) artful; urgency=medium
+
+  * control: Build libxatracker* only on x86.
+
+ -- Timo Aaltonen   Tue, 15 Aug 2017 15:52:41 +0300
+
 mesa (17.2.0~rc4-0ubuntu2) artful; urgency=medium
 
   * rules: Build gallium/svga only on x86.
diff --git a/debian/control b/debian/control
index 96da8c2..6ddbb08 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Homepage: https://mesa3d.org/
 
 Package: libxatracker2
 Section: libs
-Architecture: linux-any 
+Architecture: amd64 i386 x32
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -71,7 +71,7 @@ Description: X acceleration library -- runtime
 
 Package: libxatracker-dev
 Section: libdevel
-Architecture: linux-any
+Architecture: amd64 i386 x32
 Depends:
  libxatracker2 (= ${binary:Version}),
  ${misc:Depends},

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 configure.ac  |2 
 debian/changelog  |   11 -
 debian/rules  |   13 -
 src/amd/common/ac_binary.c|   12 +
 src/amd/common/ac_binary.h|2 
 src/amd/common/ac_nir_to_llvm.c   |   18 +
 src/amd/vulkan/radv_cmd_buffer.c  |5 
 src/amd/vulkan/radv_device.c  |   10 -
 src/amd/vulkan/radv_meta.c|   46 
 src/amd/vulkan/radv_meta.h|1 
 src/amd/vulkan/radv_meta_decompress.c |  102 +++---
 src/amd/vulkan/radv_meta_resolve.c|5 
 src/amd/vulkan/radv_meta_resolve_cs.c |   48 -
 src/amd/vulkan/radv_meta_resolve_fs.c |   38 +---
 src/amd/vulkan/radv_private.h |4 
 src/amd/vulkan/vk_format.h|   23 ++
 src/egl/drivers/dri2/platform_x11.c   |1 
 src/egl/main/eglapi.c |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |8 
 src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c |2 
 src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c   |5 
 src/gallium/drivers/radeonsi/si_state.c   |   12 -
 src/intel/isl/isl.c   |  131 +-
 src/intel/vulkan/anv_formats.c|3 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |   13 -
 27 files changed, 246 insertions(+), 276 deletions(-)

New commits:
commit a91d543e790ad6277575a1df7e3a863b328cf7e4
Author: Timo Aaltonen 
Date:   Tue Aug 15 15:26:57 2017 +0300

release to artful

diff --git a/debian/changelog b/debian/changelog
index b0928a7..e6dce05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (17.2.0~rc4-0ubuntu2) UNRELEASED; urgency=medium
+mesa (17.2.0~rc4-0ubuntu2) artful; urgency=medium
 
   * rules: Build gallium/svga only on x86.
 
- -- Timo Aaltonen   Tue, 15 Aug 2017 15:02:04 +0300
+ -- Timo Aaltonen   Tue, 15 Aug 2017 15:26:38 +0300
 
 mesa (17.2.0~rc4-0ubuntu1) artful; urgency=medium
 

commit 160b27498da37aff2852a4d9d275f4b8b1c94235
Author: Timo Aaltonen 
Date:   Tue Aug 15 15:02:15 2017 +0300

rules: Build gallium/svga only on x86.

diff --git a/debian/changelog b/debian/changelog
index 8e3e179..b0928a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (17.2.0~rc4-0ubuntu2) UNRELEASED; urgency=medium
+
+  * rules: Build gallium/svga only on x86.
+
+ -- Timo Aaltonen   Tue, 15 Aug 2017 15:02:04 +0300
+
 mesa (17.2.0~rc4-0ubuntu1) artful; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/rules b/debian/rules
index 771ea5c..d481b13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ else
   ifeq ($(DEB_HOST_ARCH_OS), linux)
confflags_DRI3 = --enable-dri3
# Gallium drivers which require kernel support, not yet ported to 
non-Linux
-   GALLIUM_DRIVERS += nouveau svga virgl
+   GALLIUM_DRIVERS += nouveau virgl
 
# Freedreno requires arm in addition
ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
@@ -56,8 +56,12 @@ else
GALLIUM_DRIVERS += etnaviv imx
endif
 
-   # svga needs xa state tracker
-   confflags_GALLIUM += --enable-xa
+   ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
+   GALLIUM_DRIVERS += svga
+   # svga needs xa state tracker
+   confflags_GALLIUM += --enable-xa
+   VULKAN_DRIVERS += intel
+   endif
 
 # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
EGL_PLATFORMS += wayland
@@ -67,9 +71,6 @@ else
 ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += nouveau
 endif
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
-   VULKAN_DRIVERS += intel
-endif
   endif
 
EGL_PLATFORMS += drm

commit 609f601ef83efe0b4c19cb08b514ccfdfecb0937
Author: Timo Aaltonen 
Date:   Tue Aug 15 10:28:46 2017 +0300

release to artful

diff --git a/debian/changelog b/debian/changelog
index fe6f8f2..8e3e179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (17.2.0~rc4-0ubuntu1) UNRELEASED; urgency=medium
+mesa (17.2.0~rc4-0ubuntu1) artful; urgency=medium
 
   * New upstream release candidate.
   * Merge from Debian.
   * patches: Refresh Mir support patches.
 
- -- Timo Aaltonen   Tue, 08 

mesa: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/patches/egl-platform-mir.patch |  129 --
 debian/patches/egl-platform-rs.patch  |  104 ---
 2 files changed, 137 insertions(+), 96 deletions(-)

New commits:
commit df04f869c02a2168fe7cea228265288d3fb3ab3f
Author: Christopher James Halse Rogers 
Date:   Thu Aug 10 17:32:47 2017 +1000

Finish refreshing Mir EGL platform patches

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 8801731..8cc5b67 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,6 +1,8 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -1723,7 +1723,9 @@ for plat in $platforms; do
+Index: mesa/configure.ac
+===
+--- mesa.orig/configure.ac 2017-08-10 16:37:31.970030645 +1000
 mesa/configure.ac  2017-08-10 17:18:19.0 +1000
+@@ -1723,7 +1723,9 @@
  PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
  DEFINES="$DEFINES -DHAVE_ANDROID_PLATFORM"
  ;;
@@ -11,7 +13,7 @@
  *)
  AC_MSG_ERROR([platform '$plat' does not exist])
  ;;
-@@ -1754,6 +1756,7 @@ AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, ec
+@@ -1754,6 +1756,7 @@
  AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$platforms" | grep -q 'drm')
  AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$platforms" | grep -q 
'surfaceless')
  AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$platforms" | grep -q 'android')
@@ -19,9 +21,11 @@
  
  dnl
  dnl More DRI setup
 a/include/EGL/eglplatform.h
-+++ b/include/EGL/eglplatform.h
-@@ -105,6 +105,13 @@ typedef struct ANativeWindow*
+Index: mesa/include/EGL/eglplatform.h
+===
+--- mesa.orig/include/EGL/eglplatform.h2017-08-10 16:37:31.970030645 
+1000
 mesa/include/EGL/eglplatform.h 2017-08-10 17:18:19.0 +1000
+@@ -105,6 +105,13 @@
  typedef struct egl_native_pixmap_t* EGLNativePixmapType;
  typedef void*   EGLNativeDisplayType;
  
@@ -35,9 +39,11 @@
  #elif defined(__unix__) || defined(__APPLE__)
  
  #if defined(MESA_EGL_NO_X11_HEADERS)
 a/include/GL/internal/dri_interface.h
-+++ b/include/GL/internal/dri_interface.h
-@@ -964,10 +964,12 @@ struct __DRIbufferRec {
+Index: mesa/include/GL/internal/dri_interface.h
+===
+--- mesa.orig/include/GL/internal/dri_interface.h  2017-08-10 
16:37:31.970030645 +1000
 mesa/include/GL/internal/dri_interface.h   2017-08-10 16:37:31.966030819 
+1000
+@@ -964,10 +964,12 @@
  unsigned int pitch;
  unsigned int cpp;
  unsigned int flags;
@@ -51,9 +57,11 @@
  struct __DRIdri2LoaderExtensionRec {
  __DRIextension base;
  
 a/src/egl/drivers/dri2/egl_dri2.c
-+++ b/src/egl/drivers/dri2/egl_dri2.c
-@@ -858,6 +858,11 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
+Index: mesa/src/egl/drivers/dri2/egl_dri2.c
+===
+--- mesa.orig/src/egl/drivers/dri2/egl_dri2.c  2017-08-10 16:37:31.970030645 
+1000
 mesa/src/egl/drivers/dri2/egl_dri2.c   2017-08-10 17:18:19.0 
+1000
+@@ -858,6 +858,11 @@
ret = dri2_initialize_wayland(drv, disp);
break;
  #endif
@@ -65,7 +73,7 @@
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
ret = dri2_initialize_android(drv, disp);
-@@ -936,6 +941,13 @@ dri2_display_destroy(_EGLDisplay *disp)
+@@ -936,6 +941,13 @@
}
break;
  #endif
@@ -79,7 +87,7 @@
  #ifdef HAVE_WAYLAND_PLATFORM
 case _EGL_PLATFORM_WAYLAND:
if (dri2_dpy->wl_drm)
-@@ -963,7 +975,8 @@ dri2_display_destroy(_EGLDisplay *disp)
+@@ -963,7 +975,8 @@
  * the ones from the gbm device. As such the gbm itself is responsible
  * for the cleanup.
  */
@@ -89,9 +97,11 @@
for (unsigned i = 0; dri2_dpy->driver_configs[i]; i++)
   free((__DRIconfig *) dri2_dpy->driver_configs[i]);
free(dri2_dpy->driver_configs);
 a/src/egl/drivers/dri2/egl_dri2.h
-+++ b/src/egl/drivers/dri2/egl_dri2.h
-@@ -65,6 +65,10 @@ struct zwp_linux_dmabuf_v1;
+Index: mesa/src/egl/drivers/dri2/egl_dri2.h
+===
+--- mesa.orig/src/egl/drivers/dri2/egl_dri2.h  2017-08-10 16:37:31.970030645 
+1000
 mesa/src/egl/drivers/dri2/egl_dri2.h   2017-08-10 17:18:19.0 
+1000
+@@ -65,6 +65,10 @@
  
  #endif /* HAVE_ANDROID_PLATFORM */
  
@@ -102,7 +112,7 @@
  #include "eglconfig.h"
  #include "eglcontext.h"
  #include "egldisplay.h"
-@@ -234,6 +238,9 @@ struct dri2_egl_display
+@@ -234,6 +238,9 @@
  
 bool  is_render_node;
 bool  is_different_gpu;
@@ -112,7 +122,7 @@
  };
  
  struct dri2_egl_context
-@@ -283,7 +290,7 @@ struct dri2_egl_surface
+@@ -283,7 +290,7 @@
 struct gbm_dri_surface *gbm_surf;
  

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .travis.yml
  |   26 
 Android.common.mk  
  |   25 
 Android.mk 
  |   86 
 Makefile.am
  |8 
 VERSION
  |2 
 bin/.cherry-ignore 
  |   14 
 bin/.editorconfig  
  |3 
 bin/get-fixes-pick-list.sh 
  |   11 
 bin/git_sha1_gen.sh
  |   12 
 bin/perf-annotate-jit.py   
  |4 
 configure.ac   
  |  475 
 debian/changelog   
  |   27 
 debian/control 
  |5 
 debian/libegl1-mesa.symbols
  |2 
 debian/patches/egl-platform-mir.patch  
  |  190 
 debian/patches/egl-platform-rs.patch   
  |   84 
 debian/patches/khr_platform_mir.patch  
  |6 
 debian/patches/vulkan-mir.patch
  |  110 
 docs/bugs.html 
  |5 
 docs/contents.html 
  |1 
 docs/download.html 
  |2 
 docs/envvars.html  
  |   62 
 docs/features.txt  
  |   14 
 docs/index.html
  |   65 
 docs/release-calendar.html 
  |   94 
 docs/releasing.html
  |   95 
 docs/relnotes.html 
  |   10 
 docs/relnotes/17.0.4.html  
  |  156 
 docs/relnotes/17.0.5.html  
  |  144 
 docs/relnotes/17.0.6.html  
  |  186 
 docs/relnotes/17.0.7.html  
  |  145 
 docs/relnotes/17.1.0.html  
  |3 
 docs/relnotes/17.1.4.html  
  |3 
 docs/relnotes/17.1.5.html  
  |  203 
 docs/relnotes/17.2.0.html  
  |   70 
 docs/shading.html  
  |2 
 include/GL/glcorearb.h 
  | 2220 +
 include/GL/glext.h 
  |  297 
 include/GL/glxext.h
  |   13 
 include/GL/internal/dri_interface.h
  |  102 
 include/GL/wglext.h
  |   20 
 include/GLES/egl.h 
  |   18 
 include/GLES/gl.h  
  |  459 
 include/GLES/glext.h   
  | 1516 -
 include/GLES/glplatform.h  
  |   26 
 include/GLES2/gl2.h
  |   14 
 include/GLES2/gl2ext.h 
  |  250 
 include/GLES2/gl2platform.h
  |   26 
 include/GLES3/gl3.h
  |   16 
 include/GLES3/gl31.h   
  |   12 
 include/GLES3/gl32.h   
  |   14 
 include/GLES3/gl3platform.h
  |   26 
 include/c11/threads_win32.h
  |   10 
 include/drm-uapi/README
  |   18 
 include/drm-uapi/drm.h 
  

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Android.common.mk |1 
 VERSION   |2 
 bin/.cherry-ignore|   14 
 configure.ac  |   15 
 debian/changelog  |   31 +
 debian/patches/egl-platform-mir.patch |   22 -
 debian/patches/egl-platform-rs.patch  |   12 
 debian/patches/khr_platform_mir.patch |2 
 docs/relnotes/17.1.2.html |3 
 docs/relnotes/17.1.3.html |  156 
 docs/relnotes/17.1.4.html |  219 
 include/pci_ids/radeonsi_pci_ids.h|1 
 src/amd/common/sid_tables.py  |2 
 src/amd/vulkan/radv_cmd_buffer.c  |   73 ++--
 src/amd/vulkan/radv_device.c  |2 
 src/amd/vulkan/radv_image.c   |3 
 src/amd/vulkan/radv_meta.c|5 
 src/amd/vulkan/radv_query.c   |5 
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c |   14 
 src/compiler/glsl/lower_distance.cpp  |2 
 src/compiler/spirv/vtn_private.h  |   14 
 src/compiler/spirv/vtn_variables.c|   14 
 src/egl/Makefile.am   |3 
 src/egl/drivers/dri2/platform_android.c   |   39 +-
 src/egl/drivers/dri2/platform_drm.c   |5 
 src/egl/drivers/dri2/platform_surfaceless.c   |3 
 src/egl/drivers/dri2/platform_wayland.c   |5 
 src/egl/drivers/dri2/platform_x11.c   |   10 
 src/egl/main/egldisplay.c |   36 +-
 src/egl/main/eglsurface.c |6 
 src/gallium/auxiliary/util/u_inlines.h|   10 
 src/gallium/auxiliary/util/u_vbuf.c   |   16 
 src/gallium/drivers/etnaviv/etnaviv_blend.c   |   48 +-
 src/gallium/drivers/etnaviv/etnaviv_blend.h   |7 
 src/gallium/drivers/etnaviv/etnaviv_clear_blit.c  |   31 +
 src/gallium/drivers/etnaviv/etnaviv_screen.c  |4 
 src/gallium/drivers/etnaviv/etnaviv_state.c   |4 
 src/gallium/drivers/etnaviv/etnaviv_transfer.c|9 
 src/gallium/drivers/etnaviv/etnaviv_translate.h   |   47 --
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |   51 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |   15 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|   19 -
 src/gallium/drivers/radeon/r600_texture.c |7 
 src/gallium/drivers/radeonsi/si_pipe.h|1 
 src/gallium/drivers/radeonsi/si_shader.h  |4 
 src/gallium/drivers/radeonsi/si_state_draw.c  |   41 +-
 src/gallium/drivers/svga/svga_screen_cache.c  |   16 
 src/gallium/drivers/svga/svga_state_gs.c  |2 
 src/gallium/drivers/svga/svga_surface.c   |8 
 src/gallium/drivers/svga/svga_winsys.h|2 
 src/gallium/drivers/swr/Makefile.am   |4 
 src/gallium/drivers/swr/SConscript|2 
 src/gallium/drivers/swr/rasterizer/core/state.h   |   27 -
 src/gallium/state_trackers/va/config.c|2 
 src/gallium/state_trackers/va/context.c   |2 
 src/gallium/targets/libgl-xlib/Makefile.am|1 
 src/gallium/winsys/amdgpu/drm/amdgpu_cs.c |   55 ++-
 src/gallium/winsys/amdgpu/drm/amdgpu_cs.h |4 
 src/gallium/winsys/svga/drm/vmw_surface.c |3 
 src/gallium/winsys/svga/drm/vmw_surface.h |2 
 src/glx/dri3_glx.c|6 
 src/intel/common/gen_device_info.c|   29 +
 src/intel/common/gen_device_info.h|1 
 src/intel/common/gen_l3_config.c  |   16 
 src/intel/vulkan/genX_cmd_buffer.c|2 
 src/mapi/Makefile.am  |3 
 src/mesa/drivers/dri/i915/i915_context.h  |   14 
 src/mesa/drivers/dri/i915/i915_fragprog.c |   16 
 src/mesa/drivers/dri/i915/i915_program.c  |2 
 src/mesa/drivers/dri/i915/i915_state.c|7 
 src/mesa/drivers/dri/i915/i915_vtbl.c |7 
 src/mesa/drivers/dri/i915/intel_reg.h |6 
 src/mesa/drivers/dri/i965/brw_blorp.c |  100 -
 src/mesa/drivers/dri/i965/brw_blorp.h

mesa: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog |   16 +++-
 debian/rules |4 ++--
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit ebc9c57730305d2f45c16d61251bb25f2888b3bb
Author: Timo Aaltonen 
Date:   Tue Jun 13 10:50:48 2017 +0300

release to experimental

diff --git a/debian/changelog b/debian/changelog
index a991d81..96619c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (17.1.2-2) UNRELEASED; urgency=medium
+mesa (17.1.2-2) experimental; urgency=medium
 
   * rules: --with-egl-platforms is deprecated, use --with-platforms
 instead.
   * rules: Enable surfaceless EGL platform.
 
- -- Timo Aaltonen   Wed, 07 Jun 2017 13:38:38 +0300
+ -- Timo Aaltonen   Tue, 13 Jun 2017 10:50:33 +0300
 
 mesa (17.1.2-1) experimental; urgency=medium
 

commit 0b1c89549f58e39b36d3d511724937f8a16bf95c
Author: Timo Aaltonen 
Date:   Mon Jun 12 10:22:01 2017 +0300

rules: Enable surfaceless EGL platform.

diff --git a/debian/changelog b/debian/changelog
index f68feb0..a991d81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (17.1.2-2) UNRELEASED; urgency=medium
 
   * rules: --with-egl-platforms is deprecated, use --with-platforms
 instead.
+  * rules: Enable surfaceless EGL platform.
 
  -- Timo Aaltonen   Wed, 07 Jun 2017 13:38:38 +0300
 
diff --git a/debian/rules b/debian/rules
index ca43bfd..be5394a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ include debian/not-installed
 DRI_DRIVERS =
 GALLIUM_DRIVERS =
 VULKAN_DRIVERS =
-EGL_PLATFORMS = x11
+EGL_PLATFORMS = x11,surfaceless
 
 confflags_DRI3 = --disable-dri3
 

commit a57fdb351dd69e5d87bbdcb35976d17a517fe52f
Author: Timo Aaltonen 
Date:   Wed Jun 7 13:38:53 2017 +0300

rules: --with-egl-platforms is deprecated, use --with-platforms instead.

diff --git a/debian/changelog b/debian/changelog
index 5297f1f..f68feb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (17.1.2-2) UNRELEASED; urgency=medium
+
+  * rules: --with-egl-platforms is deprecated, use --with-platforms
+instead.
+
+ -- Timo Aaltonen   Wed, 07 Jun 2017 13:38:38 +0300
+
 mesa (17.1.2-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index a0501e7..ca43bfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), x32))
confflags += --disable-asm
 endif
 
-confflags_EGL = --with-egl-platforms="$(EGL_PLATFORMS)"
+confflags_EGL = --with-platforms="$(EGL_PLATFORMS)"
 confflags_GLES = --disable-gles1 --enable-gles2
 confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)"
 

mesa: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog  |9 +
 debian/patches/egl-platform-mir.patch |2 +-
 debian/patches/egl-platform-rs.patch  |4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 320f962ebccfadab22a810ff4f8b0d85e6efa84f
Author: Christopher James Halse Rogers 
Date:   Fri Jun 16 18:01:05 2017 +1000

Release to artful

diff --git a/debian/changelog b/debian/changelog
index eb4acd7..16feab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (17.1.2-1ubuntu2) artful; urgency=medium
+
+  * egl-platform-mir.patch
+  * egl-platform-rs.patch
+- Fix configure.ac so that the Mir EGL platforms are actually
+  built. (LP: #1526658) (LP: #1696797)
+
+ -- Christopher James Halse Rogers   Fri, 16 Jun 2017 
17:51:50 +1000
+
 mesa (17.1.2-1ubuntu1) artful; urgency=medium
 
   * Merge from Debian.

commit 19ba4ed64f115caec20b668212ead25ceb404451
Author: Christopher James Halse Rogers 
Date:   Fri Jun 16 18:00:54 2017 +1000

Fix configure.ac detection for Mir EGL platform patches

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index d1fbc1b..faa0509 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -15,7 +15,7 @@
  AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$platforms" | grep -q 'drm')
  AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$platforms" | grep -q 
'surfaceless')
  AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$platforms" | grep -q 'android')
-+AM_CONDITIONAL(HAVE_PLATFORM_MIR, echo "$egl_platforms" | grep -q 'mir')
++AM_CONDITIONAL(HAVE_PLATFORM_MIR, echo "$platforms" | grep -q 'mir')
  
  dnl
  dnl More DRI setup
diff --git a/debian/patches/egl-platform-rs.patch 
b/debian/patches/egl-platform-rs.patch
index 9a1c887..9d8321c 100644
--- a/debian/patches/egl-platform-rs.patch
+++ b/debian/patches/egl-platform-rs.patch
@@ -30,8 +30,8 @@
 @@ -1735,6 +1742,7 @@ AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "
  AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$platforms" | grep -q 
'surfaceless')
  AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$platforms" | grep -q 'android')
- AM_CONDITIONAL(HAVE_PLATFORM_MIR, echo "$egl_platforms" | grep -q 'mir')
-+AM_CONDITIONAL(HAVE_PLATFORM_RS, echo "$egl_platforms" | grep -q 'rs')
+ AM_CONDITIONAL(HAVE_PLATFORM_MIR, echo "$platforms" | grep -q 'mir')
++AM_CONDITIONAL(HAVE_PLATFORM_RS, echo "$platforms" | grep -q 'rs')
  
  dnl
  dnl More DRI setup

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .travis.yml   |7 
 Android.common.mk |4 
 VERSION   |2 
 bin/.cherry-ignore|4 
 bin/get-extra-pick-list.sh|   10 
 bin/get-fixes-pick-list.sh|   59 -
 configure.ac  |  290 ++---
 debian/README.source  |6 
 debian/changelog  |   16 
 debian/patches/egl-platform-mir.patch |   34 
 debian/patches/egl-platform-rs.patch  |   34 
 debian/patches/vulkan-mir.patch   |   52 
 debian/upstream/signing-key.asc   |  580 ++
 docs/egl.html |   12 
 docs/releasing.html   |2 
 docs/relnotes/17.1.0.html |3 
 docs/relnotes/17.1.1.html |  188 +++
 docs/relnotes/17.1.2.html |  186 +++
 include/pci_ids/radeonsi_pci_ids.h|4 
 src/amd/Makefile.common.am|2 
 src/amd/addrlib/gfx9/gfx9addrlib.cpp  |   57 
 src/amd/addrlib/gfx9/gfx9addrlib.h|8 
 src/amd/common/amd_family.h   |1 
 src/amd/common/amdgpu_id.h|   10 
 src/amd/vulkan/Makefile.am|   38 
 src/amd/vulkan/radv_cmd_buffer.c  |8 
 src/compiler/glsl/shader_cache.cpp|2 
 src/compiler/nir/nir_lower_tex.c  |6 
 src/egl/Makefile.am   |   14 
 src/egl/drivers/dri2/egl_dri2.h   |4 
 src/egl/drivers/dri2/platform_android.c   |   13 
 src/egl/drivers/dri2/platform_wayland.c   |  130 +-
 src/egl/main/eglapi.c |   19 
 src/egl/main/egldisplay.c |2 
 src/gallium/auxiliary/Makefile.am |   20 
 src/gallium/auxiliary/Makefile.sources|   10 
 src/gallium/auxiliary/gallivm/lp_bld_init.c   |   34 
 src/gallium/auxiliary/renderonly/renderonly.c |1 
 src/gallium/auxiliary/vl/vl_winsys.h  |   21 
 src/gallium/drivers/etnaviv/etnaviv_resource.c|2 
 src/gallium/drivers/etnaviv/etnaviv_translate.h   |2 
 src/gallium/drivers/freedreno/freedreno_context.c |8 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |2 
 src/gallium/drivers/radeon/Makefile.am|6 
 src/gallium/drivers/radeon/r600_pipe_common.c |2 
 src/gallium/drivers/radeon/r600_texture.c |   16 
 src/gallium/drivers/radeonsi/si_pipe.c|   20 
 src/gallium/drivers/radeonsi/si_state.c   |3 
 src/gallium/drivers/radeonsi/si_state_draw.c  |   14 
 src/gallium/drivers/radeonsi/si_state_shaders.c   |   29 
 src/gallium/drivers/swr/Makefile.am   |   41 
 src/gallium/drivers/swr/rasterizer/memory/StoreTile.h |   75 +
 src/gallium/drivers/swr/swr_context.cpp   |   77 -
 src/gallium/drivers/swr/swr_screen.cpp|   10 
 src/gallium/drivers/vc4/vc4_resource.c|3 
 src/gallium/state_trackers/omx/Makefile.am|1 
 src/gallium/state_trackers/omx/entrypoint.c   |6 
 src/gallium/state_trackers/omx/vid_dec.h  |2 
 src/gallium/state_trackers/va/Makefile.am |1 
 src/gallium/state_trackers/va/context.c   |4 
 src/gallium/state_trackers/vdpau/Makefile.am  |1 
 src/gallium/state_trackers/vdpau/device.c |2 
 src/gallium/state_trackers/xvmc/Makefile.am   |3 
 src/gallium/targets/dri/Android.mk|3 
 src/gallium/targets/omx/Makefile.am   |7 
 src/gallium/targets/va/Makefile.am|7 
 src/gallium/targets/vdpau/Makefile.am |1 
 src/gallium/targets/xvmc/Makefile.am  |1 
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c |4 
 src/gallium/winsys/virgl/drm/virgl_drm_winsys.c   |   14 
 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .travis.yml
 |  353 
 Android.common.mk  
 |   37 
 Android.mk 
 |   16 
 Makefile.am
 |6 
 REVIEWERS  
 |6 
 VERSION
 |2 
 appveyor.yml   
 |   10 
 bin/.cherry-ignore 
 |   50 
 bin/bugzilla_mesa.sh   
 |   38 
 bin/get-fixes-pick-list.sh 
 |4 
 bin/perf-annotate-jit  
 |  251 
 bin/perf-annotate-jit.py   
 |  251 
 bin/shortlog_mesa.sh   
 |4 
 configure.ac   
 |  468 
 debian/changelog   
 |   17 
 debian/control 
 |3 
 debian/libgbm1.symbols 
 |7 
 debian/patches/egl-platform-mir.patch  
 |   30 
 debian/patches/egl-platform-rs.patch   
 |   32 
 debian/patches/i915-dont-default-to-2.1.patch  
 |   78 
 debian/patches/khr_platform_mir.patch  
 |   10 
 debian/patches/series  
 |1 
 debian/patches/vulkan-mir.patch
 |  254 
 debian/rules   
 |3 
 docs/README.WIN32  
 |2 
 docs/application-issues.html   
 |2 
 docs/autoconf.html 
 |4 
 docs/bugs.html 
 |2 
 docs/codingstyle.html  
 |4 
 docs/contents.html 
 |   14 
 docs/developers.html   
 |4 
 docs/download.html 
 |   45 
 docs/egl.html  
 |   10 
 docs/envvars.html  
 |   15 
 docs/faq.html  
 |   22 
 docs/features.txt  
 |   57 
 docs/helpwanted.html   
 |   18 
 docs/index.html
 |   78 
 docs/install.html  
 |4 
 docs/intro.html
 |   58 
 docs/license.html  
 |6 
 docs/lists.html
 |   22 
 docs/llvmpipe.html 
 |   28 
 docs/opengles.html 
 |4 
 docs/patents.txt   
 |4 
 docs/postprocess.html  
 |2 
 docs/precompiled.html  
 |   10 
 docs/releasing.html
 |  123 
 docs/relnotes.html 
 |8 
 docs/relnotes/12.0.6.html  
 |  148 
 docs/relnotes/13.0.4.html  
 |  255 
 docs/relnotes/13.0.5.html  
 |  210 
 docs/relnotes/13.0.6.html  
 |  287 
 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit cd14c2b72bbca6196b26fe054e9548db99d8908d
Author: Timo Aaltonen 
Date:   Thu May 11 13:53:38 2017 +0300

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 1f60130..9d1ef22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (17.1.0-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian.
+  * i915-dont-default-to-2.1.patch: Dropped, implemented upstream.
+  * Refresh patches, disable Mir vulkan support as it doesn't build.
+
+ -- Timo Aaltonen   Thu, 27 Apr 2017 08:23:14 +0300
+
 mesa (17.1.0-1) experimental; urgency=medium
 
   * New upstream release.
@@ -7,14 +15,6 @@ mesa (17.1.0-1) experimental; urgency=medium
 
  -- Timo Aaltonen   Thu, 11 May 2017 09:59:50 +0300
 
-mesa (17.1.0~rc2-0ubuntu1) UNRELEASED; urgency=medium
-
-  * Merge from Debian.
-  * i915-dont-default-to-2.1.patch: Dropped, implemented upstream.
-  * Refresh patches, disable Mir vulkan support as it doesn't build.
-
- -- Timo Aaltonen   Thu, 27 Apr 2017 08:23:14 +0300
-
 mesa (17.0.5-0ubuntu1) artful; urgency=medium
 
   * New upstream bugfix release. (LP: #1686344)

commit 474be12d2daa9ae177bcfa76ef3385a5b20a2d62
Author: Timo Aaltonen 
Date:   Thu May 11 10:00:07 2017 +0300

release to experimental

diff --git a/debian/changelog b/debian/changelog
index b960c1f..e48498b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (17.1.0-1) UNRELEASED; urgency=medium
+mesa (17.1.0-1) experimental; urgency=medium
 
   * New upstream release.
   * control: Add zlib1g-dev to build-depends.
   * control: Bump libdrm-dev build-dep to 2.4.80.
   * libgbm1.symbols: Updated.
 
- -- Timo Aaltonen   Wed, 26 Apr 2017 09:09:19 +0300
+ -- Timo Aaltonen   Thu, 11 May 2017 09:59:50 +0300
 
 mesa (17.0.4-1) experimental; urgency=medium
 

commit 5b55a4ff570a77d3bf59fb4de2695f86ee9584be
Author: Timo Aaltonen 
Date:   Thu May 11 09:50:16 2017 +0300

bump version

diff --git a/debian/changelog b/debian/changelog
index c7e5d27..b960c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-mesa (17.1.0~rc2-1) UNRELEASED; urgency=medium
+mesa (17.1.0-1) UNRELEASED; urgency=medium
 
-  * New upstream release candidate.
+  * New upstream release.
   * control: Add zlib1g-dev to build-depends.
   * control: Bump libdrm-dev build-dep to 2.4.80.
   * libgbm1.symbols: Updated.

commit 15a38605fc3aa49c01943f9ec2be19d58fef4aac
Author: Emil Velikov 
Date:   Wed May 10 12:11:03 2017 +0100

docs: Update 17.1.0 release notes

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html
index e7cfe38..af5094d 100644
--- a/docs/relnotes/17.1.0.html
+++ b/docs/relnotes/17.1.0.html
@@ -14,7 +14,7 @@
 
 
 
-Mesa 17.1.0 Release Notes / TBD
+Mesa 17.1.0 Release Notes / May 10, 2017
 
 
 Mesa 17.1.0 is a new development release.
@@ -63,6 +63,147 @@ Note: some of the new features are only available with 
certain drivers.
 Bug fixes
 
 
+
+https://bugs.freedesktop.org/show_bug.cgi?id=68504;>Bug 68504 
- 9.2-rc1 workaround for clover build failure on ppc/altivec: cannot convert 
'bool' to '__vector(4) __bool int' in return
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84325;>Bug 84325 
- X.Org segfaults when starting DE on an Intel+Radeon laptop, caused by 
libpciaccess cleanup, patch attached
+
+https://bugs.freedesktop.org/show_bug.cgi?id=93089;>Bug 93089 
- mesa fails to check for gcc atomic primitives before using them
+
+https://bugs.freedesktop.org/show_bug.cgi?id=95460;>Bug 95460 
- Please add more drivers (freedreno, virgl) to features.txt status 
document
+
+https://bugs.freedesktop.org/show_bug.cgi?id=96743;>Bug 96743 
- [BYT, HSW, SKL, BXT, KBL] GPU hangs with GfxBench 4.0 CarChase
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97102;>Bug 97102 
- [dri][swr] stack overflow / infinite loop with GALLIUM_DRIVER=swr
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97338;>Bug 97338 
- Black squares in the Spec Ops: The Line chapter select screen
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97524;>Bug 97524 
- Samplers referring to the same texture unit with different types should raise 
GL_INVALID_OPERATION
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97967;>Bug 97967 
- glsl/tests/cache-test regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97988;>Bug 97988 
- [radeonsi] playing back videos with VDPAU exhibits 
deinterlacing/anti-aliasing issues not visible with VA-API
+
+https://bugs.freedesktop.org/show_bug.cgi?id=98263;>Bug 98263 
- [radv] The Talos Principle fails to launch with Fatal error: Cannot set 
display mode.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=98428;>Bug 98428 
- Undefined non-weak-symbol in dri-drivers
+

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION|2 
 bin/.cherry-ignore |   45 
 configure.ac   |4 
 debian/changelog   |6 
 docs/relnotes/17.0.4.html  |3 
 docs/relnotes/17.0.5.html  |  143 +
 src/amd/vulkan/radv_device.c   |2 
 src/amd/vulkan/radv_radeon_winsys.h|2 
 src/compiler/glsl/glsl_to_nir.cpp  |3 
 src/compiler/nir/nir_intrinsics.h  |2 
 src/gallium/auxiliary/util/u_queue.c   |   11 -
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp  |   15 +
 src/gallium/state_trackers/clover/llvm/codegen.hpp |2 
 src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp |4 
 src/gallium/state_trackers/clover/llvm/codegen/common.cpp  |6 
 src/gallium/state_trackers/clover/llvm/codegen/native.cpp  |2 
 src/gallium/state_trackers/clover/llvm/compat.hpp  |8 
 src/gallium/state_trackers/clover/llvm/metadata.hpp|   12 -
 src/gallium/winsys/sw/dri/dri_sw_winsys.c  |2 
 src/intel/vulkan/anv_blorp.c   |   38 +++
 src/intel/vulkan/genX_cmd_buffer.c |  106 +
 src/mapi/glapi/gen/gl_API.xml  |2 
 src/mesa/Makefile.am   |1 
 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp  |5 
 src/mesa/drivers/dri/i965/brw_vec4.cpp |7 
 src/mesa/main/api_validate.c   |  104 +++--
 src/mesa/main/api_validate.h   |4 
 src/mesa/main/uniform_query.cpp|2 
 src/mesa/main/uniforms.c   |   23 +-
 src/mesa/main/varray.c |   18 -
 src/mesa/program/ir_to_mesa.cpp|5 
 src/mesa/state_tracker/st_draw.c   |2 
 src/mesa/vbo/vbo_exec_array.c  |   52 
 src/mesa/vbo/vbo_save_api.c|   35 +++
 34 files changed, 541 insertions(+), 137 deletions(-)

New commits:
commit 73eb557dab50e93742320912d0ba436d750d5760
Author: Timo Aaltonen 
Date:   Thu May 4 20:08:57 2017 +0300

upload to artful

diff --git a/debian/changelog b/debian/changelog
index 20f7f55..07b312e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (17.0.5-0ubuntu1) artful; urgency=medium
+
+  * New upstream bugfix release. (LP: #1686344)
+
+ -- Timo Aaltonen   Thu, 04 May 2017 20:07:36 +0300
+
 mesa (17.0.4-1ubuntu1) artful; urgency=medium
 
   * Merge from Debian.

commit 61b134a862ecc1877bbe2f2c14e493b5fb607e04
Author: Andres Gomez 
Date:   Fri Apr 28 20:41:38 2017 +0300

docs: add release notes for 17.0.5

Signed-off-by: Andres Gomez 

diff --git a/docs/relnotes/17.0.5.html b/docs/relnotes/17.0.5.html
new file mode 100644
index 000..8649f89
--- /dev/null
+++ b/docs/relnotes/17.0.5.html
@@ -0,0 +1,143 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.0.5 Release Notes / April 28, 2017
+
+
+Mesa 17.0.5 is a bug fix release which fixes bugs found since the 17.0.4 
release.
+
+
+Mesa 17.0.5 implements the OpenGL 4.5 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.5.  OpenGL
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97524;>Bug 97524 
- Samplers referring to the same texture unit with different types should raise 
GL_INVALID_OPERATION
+
+
+
+
+Changes
+
+Andres Gomez (16):
+
+  cherry-ignore: Add the pci_id into the shader cache UUID
+  cherry-ignore: fix crash if ctx torn down with no rendering
+  cherry-ignore: Fix typos.
+  cherry-ignore: Revert "etnaviv: Cannot render to rb-swapped formats"
+  cherry-ignore: Revert "i965/fs: Don't emit SEL instructions for 
type-converting MOVs."
+  cherry-ignore: fix typo in a2b10g10r10 fast clear calculation
+  cherry-ignore: remove unused anv_dispatch_table dtable
+  cherry-ignore: remove unused radv_dispatch_table dtable
+  cherry-ignore: make radv_resolve_entrypoint static
+  cherry-ignore: vulkan: add support for libmesa_vulkan_util
+  cherry-ignore: r600: fix libmesa_amd_common dependency
+  

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 bin/.cherry-ignore|3 
 debian/changelog  |   12 
 docs/relnotes/17.0.3.html |3 
 docs/relnotes/17.0.4.html |  148 
 include/pci_ids/radeonsi_pci_ids.h|1 
 src/amd/vulkan/radv_cmd_buffer.c  |3 
 src/gallium/auxiliary/util/u_debug.h  |4 
 src/gallium/drivers/freedreno/freedreno_draw.c|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |   23 +
 src/gallium/drivers/nouveau/nouveau_buffer.c  |6 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/state_trackers/dri/dri2.c |2 
 src/gallium/targets/omx/omx.sym   |5 
 src/gallium/targets/pipe-loader/pipe.sym  |5 
 src/gallium/targets/va/va.sym |5 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |   11 
 src/gallium/winsys/radeon/drm/radeon_drm_cs.c |   27 +-
 src/gallium/winsys/sw/hgl/hgl_sw_winsys.c |3 
 src/gbm/backends/dri/gbm_dri.c|8 
 src/intel/vulkan/anv_cmd_buffer.c |   10 
 src/intel/vulkan/genX_blorp_exec.c|   15 +
 src/intel/vulkan/genX_pipeline.c  |   27 +-
 src/loader/loader.c   |2 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp  |   18 -
 src/mesa/drivers/dri/i965/genX_blorp_exec.c   |   16 +
 src/mesa/drivers/dri/i965/intel_screen.c  |  172 +++---
 src/mesa/state_tracker/st_atom_image.c|2 
 src/mesa/state_tracker/st_atom_texture.c  |2 
 src/mesa/state_tracker/st_cb_fbo.c|2 
 src/mesa/state_tracker/st_cb_texture.c|5 
 src/mesa/state_tracker/st_cb_texture.h|3 
 src/mesa/state_tracker/st_gen_mipmap.c|2 
 33 files changed, 454 insertions(+), 97 deletions(-)

New commits:
commit 7a57b3633ff4230134ae9fdd3793d3becda27858
Author: Timo Aaltonen 
Date:   Wed Apr 26 11:02:07 2017 +0300

release to artful

diff --git a/debian/changelog b/debian/changelog
index 972af57..20f7f55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (17.0.4-1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen   Wed, 26 Apr 2017 11:01:18 +0300
+
 mesa (17.0.4-1) experimental; urgency=medium
 
   * New upstrem release.

commit 7af911e5db3e664e8f0290f7d6260d82e8aeaea8
Author: Timo Aaltonen 
Date:   Wed Apr 19 16:16:51 2017 +0300

upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 5761be2..8687382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (17.0.4-1) UNRELEASED; urgency=medium
+mesa (17.0.4-1) experimental; urgency=medium
 
   * New upstrem release.
 
- -- Timo Aaltonen   Wed, 19 Apr 2017 14:22:13 +0300
+ -- Timo Aaltonen   Wed, 19 Apr 2017 16:14:20 +0300
 
 mesa (17.0.3-1) experimental; urgency=medium
 

commit e14c595cee5d711244331d257c9a41ab6b600080
Author: Timo Aaltonen 
Date:   Wed Apr 19 14:23:00 2017 +0300

update changelog

diff --git a/debian/changelog b/debian/changelog
index 0c014d1..5761be2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (17.0.4-1) UNRELEASED; urgency=medium
+
+  * New upstrem release.
+
+ -- Timo Aaltonen   Wed, 19 Apr 2017 14:22:13 +0300
+
 mesa (17.0.3-1) experimental; urgency=medium
 
   * New upstream release.

commit 367bafc7c153611b39bb41145a9601e5f1cb4934
Author: Emil Velikov 
Date:   Mon Apr 17 14:38:04 2017 +0100

docs: add release notes for 17.0.4

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/17.0.4.html b/docs/relnotes/17.0.4.html
new file mode 100644
index 000..ccc3864
--- /dev/null
+++ b/docs/relnotes/17.0.4.html
@@ -0,0 +1,148 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.0.4 Release Notes / April 17, 2017
+
+
+Mesa 17.0.4 is a bug fix release which fixes bugs found since the 17.0.3 
release.
+
+
+Mesa 17.0.4 implements the OpenGL 4.5 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.5.  OpenGL
+4.5 is only available if requested at context 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION |2 
 bin/.cherry-ignore  |6 
 debian/changelog|   13 
 debian/upstream/signing-key.asc |   76 
 docs/relnotes/17.0.2.html   |3 
 docs/relnotes/17.0.3.html   |  188 
 include/c11/threads.h   |5 
 include/pci_ids/radeonsi_pci_ids.h  |1 
 src/amd/vulkan/radv_cmd_buffer.c|8 
 src/compiler/glsl/linker.cpp|6 
 src/compiler/glsl/lower_jumps.cpp   |   17 -
 src/compiler/glsl/tests/cache_test.c|2 
 src/compiler/glsl/tests/lower_jumps/create_test_cases.py|   17 -
 src/gallium/drivers/freedreno/freedreno_draw.c  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp |1 
 src/gallium/drivers/radeonsi/si_state_shaders.c |2 
 src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp |2 
 src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp |2 
 src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp |2 
 src/gallium/state_trackers/clover/core/resource.cpp |   11 
 src/gallium/state_trackers/clover/core/resource.hpp |1 
 src/gallium/state_trackers/nine/nine_csmt_helper.h  |2 
 src/gallium/state_trackers/nine/resource9.c |4 
 src/gallium/state_trackers/nine/surface9.c  |   10 
 src/gallium/state_trackers/nine/volume9.c   |   10 
 src/intel/isl/isl.c |2 
 src/intel/vulkan/anv_blorp.c|   24 -
 src/intel/vulkan/anv_image.c|9 
 src/intel/vulkan/anv_private.h  |   13 
 src/intel/vulkan/anv_query.c|   60 ++-
 src/intel/vulkan/genX_cmd_buffer.c  |   59 ++-
 src/intel/vulkan/genX_pipeline.c|4 
 src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp   |2 
 src/mesa/drivers/dri/i965/brw_misc_state.c  |3 
 src/mesa/drivers/dri/i965/gen8_surface_state.c  |5 
 src/mesa/drivers/dri/i965/intel_screen.c|   11 
 src/mesa/main/api_validate.c|   24 +
 src/mesa/main/api_validate.h|2 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp  |1 
 39 files changed, 509 insertions(+), 103 deletions(-)

New commits:
commit 809c1bc9234f72afc82ec4ac69b2487cf8f4baf0
Author: Timo Aaltonen 
Date:   Mon Apr 3 19:20:25 2017 +0300

upload to zesty

diff --git a/debian/changelog b/debian/changelog
index 7378622..e6ff8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (17.0.3-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen   Mon, 03 Apr 2017 19:03:10 +0300
+
 mesa (17.0.3-1) experimental; urgency=medium
 
   * New upstream release.

commit 4a3a6cb8fabd56a18ab9085d114bd13b3bf0e3a1
Author: Andreas Boll 
Date:   Mon Apr 3 11:36:17 2017 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index b7ba713..0c014d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (17.0.3-1) UNRELEASED; urgency=medium
+mesa (17.0.3-1) experimental; urgency=medium
 
   * New upstream release.
   * Update d/upstream/signing-key.asc with key from Andres Gomez.
 
- -- Andreas Boll   Mon, 03 Apr 2017 10:10:35 +0200
+ -- Andreas Boll   Mon, 03 Apr 2017 11:35:58 +0200
 
 mesa (17.0.2-1) experimental; urgency=medium
 

commit cabb4251658368c8104f9c57e8bd7ff0ed576996
Author: Andreas Boll 
Date:   Mon Apr 3 10:11:46 2017 +0200

Update d/upstream/signing-key.asc with key from Andres Gomez.

diff --git a/debian/changelog b/debian/changelog
index a007454..b7ba713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (17.0.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update d/upstream/signing-key.asc with key from Andres Gomez.
 
  -- Andreas Boll   Mon, 03 Apr 2017 10:10:35 +0200
 
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 360f6c8..797c071 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -616,3 +616,79 @@ 
KLVjCNf/FusqCTgbZU06x1S/75XJwcsFENWkWYPEaxxzQiCs1rVzG8SnrOjcyc5F
 T0rEAQLWU7eq9U6nd4BXMkokiuzlOKWqsDyXibR3wkhI80kAJw==
 =XSpT
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .gitignore|1 
 debian/changelog  |   10 
 debian/control|4 
 debian/patches/egl-platform-rs.patch  | 1185 ++
 debian/patches/khr_platform_mir.patch |   82 ++
 debian/patches/series |3 
 debian/patches/vulkan-mir.patch   | 1065 ++
 debian/rules  |1 
 8 files changed, 2349 insertions(+), 2 deletions(-)

New commits:
commit e7332d41cc28a6e1b6606be1c41b682949a923ae
Author: Timo Aaltonen 
Date:   Tue Mar 28 19:48:32 2017 +0300

upload to zesty

diff --git a/debian/changelog b/debian/changelog
index 08dffad..cd5ad0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (17.0.2-1ubuntu2) UNRELEASED; urgency=medium
+mesa (17.0.2-1ubuntu2) zesty; urgency=medium
 
   [ Cemil Azizoglu ]
   * egl-platform-rs.patch: Add support for Mir's new render surface based
@@ -6,7 +6,7 @@ mesa (17.0.2-1ubuntu2) UNRELEASED; urgency=medium
   * khr_platform_mir.patch: Add EGL_KHR_platform_mir
   * vulkan-mir.patch: Add Vulkan WSI driver for Mir
 
- -- Timo Aaltonen   Tue, 28 Mar 2017 19:15:55 +0300
+ -- Timo Aaltonen   Tue, 28 Mar 2017 19:22:29 +0300
 
 mesa (17.0.2-1ubuntu1) zesty; urgency=medium
 

commit fb51f537b0a542a149a7e83806117405c2b0f1c6
Author: Cemil Azizoglu 
Date:   Mon Feb 13 11:09:32 2017 -0600

Add platform-rs, vulkan-mir, EGL_KHR_platform_mir.

This commit
- incorporates support for Mir's new render surface based EGL driver
(alpha)
- adds Vulkan WSI driver for Mir (alpha)
- adds EGL_KHR_platform_mir (yet to be ratified)

The render surface-based backend is implemented as a new platform so the
legacy (buffer stream-based) backend can be supported simultaneously.

TODO:
- Mir-team intends to change the name 'render surface' (and all its
associated symbols) to 'surface' in the very new feature. As soon as
that happens this patch will require a refresh.

diff --git a/.gitignore b/.gitignore
index 9644092..991556e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ Makefile.in
 .install-gallium-links
 /src/git_sha1.h
 TAGS
+/.project
diff --git a/debian/changelog b/debian/changelog
index 38ee0c7..08dffad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (17.0.2-1ubuntu2) UNRELEASED; urgency=medium
+
+  [ Cemil Azizoglu ]
+  * egl-platform-rs.patch: Add support for Mir's new render surface based
+EGL driver
+  * khr_platform_mir.patch: Add EGL_KHR_platform_mir
+  * vulkan-mir.patch: Add Vulkan WSI driver for Mir
+
+ -- Timo Aaltonen   Tue, 28 Mar 2017 19:15:55 +0300
+
 mesa (17.0.2-1ubuntu1) zesty; urgency=medium
 
   * Merge from Debian experimental.
diff --git a/debian/control b/debian/control
index 0cb9185..b678c73 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends:
  libxcb-randr0-dev,
  libxcb-sync-dev,
  libxshmfence-dev (>= 1.1),
- libmirclient-dev [linux-any],
+ libmirclient-dev (>= 0.26.2) [linux-any],
  mir-client-platform-mesa-dev [linux-any],
  python,
  python-mako,
@@ -157,7 +157,7 @@ Depends:
  libx11-xcb-dev,
  libwayland-dev (>= 1.11.0) [linux-any],
  ${misc:Depends},
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el !kfreebsd-any !hurd-any],
+ libmirclient-dev (>= 0.26.2) [!arm64 !powerpc !ppc64 !ppc64el !kfreebsd-any 
!hurd-any],
 Multi-Arch: same
 Description: free implementation of the EGL API -- development files
  This package contains the development environment required for compiling
diff --git a/debian/patches/egl-platform-rs.patch 
b/debian/patches/egl-platform-rs.patch
new file mode 100644
index 000..210f4f4
--- /dev/null
+++ b/debian/patches/egl-platform-rs.patch
@@ -0,0 +1,1185 @@
+--- a/configure.ac
 b/configure.ac
+@@ -91,6 +91,7 @@ XSHMFENCE_REQUIRED=1.1
+ XVMC_REQUIRED=1.0.6
+ PYTHON_MAKO_REQUIRED=0.8.0
+ LIBSENSORS_REQUIRED=4.0.0
++MIR_REQUIRED=0.26.2
+ 
+ dnl LLVM versions
+ LLVM_REQUIRED_GALLIUM=3.3.0
+@@ -2131,9 +2132,15 @@ for plat in $egl_platforms; do
+   android)
+   PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
+   ;;
+-mir)
+-PKG_CHECK_MODULES([MIR], [mirclient mir-client-platform-mesa])
+-;;
++
++  mir)
++  PKG_CHECK_MODULES([MIR], [mirclient mir-client-platform-mesa])
++  ;;
++
++  rs)
++  PKG_CHECK_MODULES([RS], [mirclient >= $MIR_REQUIRED])
++  ;;
++
+   *)
+   AC_MSG_ERROR([EGL platform '$plat' does not exist])
+   ;;
+@@ -2161,6 +2168,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, ec
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_SURFACELESS, echo "$egl_platforms" | grep -q 
'surfaceless')
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_ANDROID, echo "$egl_platforms" | grep -q 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION |2 
 bin/.cherry-ignore  |2 
 debian/changelog|   18 +
 debian/control  |   14 -
 debian/rules|4 
 docs/relnotes/17.0.1.html   |3 
 docs/relnotes/17.0.2.html   |  184 
 src/amd/common/ac_nir_to_llvm.c |   17 +
 src/amd/common/ac_nir_to_llvm.h |4 
 src/amd/vulkan/radv_cmd_buffer.c|5 
 src/amd/vulkan/radv_device.c|2 
 src/amd/vulkan/radv_formats.c   |3 
 src/amd/vulkan/radv_image.c |3 
 src/amd/vulkan/radv_meta_buffer.c   |2 
 src/compiler/nir/nir_intrinsics.h   |4 
 src/egl/drivers/dri2/egl_dri2.c |   14 +
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c  |4 
 src/gallium/drivers/nouveau/nvc0/nve4_compute.c |4 
 src/gallium/drivers/radeonsi/si_descriptors.c   |3 
 src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c |   10 +
 src/intel/vulkan/anv_blorp.c|   35 ++-
 src/intel/vulkan/anv_device.c   |   10 -
 src/intel/vulkan/anv_image.c|9 
 src/intel/vulkan/anv_pass.c |   22 +-
 src/mapi/glapi/gen/gl_API.xml   |2 
 src/mesa/drivers/dri/i965/brw_defines.h |6 
 src/mesa/drivers/dri/i965/brw_fs.cpp|   47 +++--
 src/mesa/drivers/dri/i965/brw_fs_generator.cpp  |2 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp|   47 ++---
 src/mesa/main/fbobject.c|2 
 src/mesa/state_tracker/st_atom.c|   10 -
 src/mesa/state_tracker/st_cb_readpixels.c   |   13 +
 src/mesa/state_tracker/st_cb_texture.c  |6 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp  |   11 -
 src/util/ralloc.c   |   15 +
 src/vulkan/wsi/wsi_common_x11.c |   51 -
 36 files changed, 486 insertions(+), 104 deletions(-)

New commits:
commit 12a04e733dd81df7b57a51a9e814f5d9134c2f44
Author: Timo Aaltonen 
Date:   Tue Mar 21 16:20:07 2017 +0200

upload to zesty

diff --git a/debian/changelog b/debian/changelog
index 4853fd0..38ee0c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (17.0.2-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian experimental.
+
+ -- Timo Aaltonen   Tue, 21 Mar 2017 13:36:51 +0200
+
 mesa (17.0.2-1) experimental; urgency=medium
 
   [ Timo Aaltonen ]

commit c639f2f27663d635464079b852592d1f68bb9e6b
Author: Andreas Boll 
Date:   Tue Mar 21 11:35:20 2017 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 85317ef..3959bee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (17.0.2-1) UNRELEASED; urgency=medium
+mesa (17.0.2-1) experimental; urgency=medium
 
   [ Timo Aaltonen ]
   * New upstream release.
@@ -8,7 +8,7 @@ mesa (17.0.2-1) UNRELEASED; urgency=medium
 - Enables radeonsi, llvmpipe and radv drivers.
 - Enables OpenCL support.
 
- -- Timo Aaltonen   Tue, 21 Mar 2017 09:30:52 +0200
+ -- Andreas Boll   Tue, 21 Mar 2017 11:35:09 +0100
 
 mesa (17.0.1-1) experimental; urgency=medium
 

commit df9a7e6e71925c3a9ddd426302a3e9bb4e5fc34d
Author: Andreas Boll 
Date:   Tue Mar 21 10:46:40 2017 +0100

Require LLVM on sparc64

- Enables radeonsi, llvmpipe and radv drivers.
- Enables OpenCL support.

diff --git a/debian/changelog b/debian/changelog
index 7688c5a..85317ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 mesa (17.0.2-1) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * New upstream release.
 
+  [ Andreas Boll ]
+  * Require LLVM on sparc64:
+- Enables radeonsi, llvmpipe and radv drivers.
+- Enables OpenCL support.
+
  -- Timo Aaltonen   Tue, 21 Mar 2017 09:30:52 +0200
 
 mesa (17.0.1-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 26a3ba1..bbbd6ef 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  libxext-dev,
  libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
  libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
- libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc 
ppc64 ppc64el x32],
+ libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc 
ppc64 ppc64el sparc64 x32],
  autoconf,
  automake,
  libtool,
@@ -41,11 +41,11 @@ Build-Depends:
  python-mako,
  flex,
  bison,
- llvm-4.0-dev (>= 1:4.0~) [amd64 arm64 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Android.common.mk |2 
 VERSION   |2 
 configure.ac  |  124 +++--
 debian/changelog  |   19 
 debian/control|   10 
 debian/patches/egl-platform-mir.patch |   11 
 debian/rules  |2 
 docs/relnotes/17.0.0.html |  213 +-
 src/amd/common/ac_nir_to_llvm.c   |   11 
 src/amd/vulkan/radv_image.c   |3 
 src/compiler/glsl/builtin_functions.cpp   |   18 
 src/gallium/auxiliary/tgsi/tgsi_dump.c|   24 -
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |   51 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.h|5 
 src/gallium/drivers/radeon/r600_buffer_common.c   |   17 
 src/gallium/drivers/radeonsi/si_state.h   |2 
 src/gallium/drivers/swr/rasterizer/core/clip.h|   39 -
 src/gallium/winsys/amdgpu/drm/amdgpu_bo.c |   17 
 src/glx/dri3_glx.c|   10 
 src/glx/glxcmds.c |   18 
 src/intel/vulkan/anv_blorp.c  |   10 
 src/intel/vulkan/anv_pass.c   |1 
 src/mesa/drivers/dri/common/dri_util.c|   12 
 src/mesa/drivers/dri/i965/brw_state.h |7 
 src/mesa/drivers/dri/i965/brw_state_upload.c  |3 
 src/mesa/drivers/dri/i965/gen6_clip_state.c   |   57 --
 src/mesa/drivers/dri/i965/gen6_sf_state.c |   15 
 src/mesa/drivers/dri/i965/gen6_viewport_state.c   |  150 ---
 src/mesa/drivers/dri/i965/gen7_sf_state.c |   12 
 src/mesa/drivers/dri/i965/gen7_viewport_state.c   |   39 -
 src/mesa/drivers/dri/i965/gen8_viewport_state.c   |   48 --
 src/mesa/state_tracker/st_extensions.c|2 
 src/mesa/vbo/vbo_save_api.c   |7 
 src/util/disk_cache.c |   33 +
 34 files changed, 603 insertions(+), 391 deletions(-)

New commits:
commit fd2485ca700994fdabdead0748d6b915e805651c
Author: Timo Aaltonen 
Date:   Mon Feb 13 17:01:14 2017 +0200

upload to zesty

diff --git a/debian/changelog b/debian/changelog
index 3829482..31f260c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (17.0.0-1ubuntu1) UNRELEASED; urgency=medium
+mesa (17.0.0-1ubuntu1) zesty; urgency=medium
 
   [ Timo Aaltonen ]
   * Merge from Debian.
@@ -10,7 +10,7 @@ mesa (17.0.0-1ubuntu1) UNRELEASED; urgency=medium
   upstream and made wayland specific).
 - Change MirSurfaceParameters into MirWindowParameters.
 
- -- Timo Aaltonen   Tue, 07 Feb 2017 13:50:06 +0200
+ -- Timo Aaltonen   Mon, 13 Feb 2017 16:19:39 +0200
 
 mesa (17.0.0-1) experimental; urgency=medium
 

commit 5c028e0904e6738c2b2fb3f1fc0888b7e2b84072
Author: Cemil Azizoglu 
Date:   Wed Feb 8 16:36:52 2017 -0600

Refresh egl-platform-mir.patch

- remove device_name field (removed from the generic struct in the
upstream and made wayland specific).

- Change MirSurfaceParameters into MirWindowParameters.

diff --git a/debian/changelog b/debian/changelog
index acc2e32..3829482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 mesa (17.0.0-1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * Merge from Debian.
   * Drop patches for 16k wide textures on i965, upstream.
-  * egl-platform-mir.patch: Refreshed.
+
+  [ Cemil Azizoglu ]
+  * Updated egl-platform-mir.patch.
+- remove device_name field (removed from the generic struct in the
+  upstream and made wayland specific).
+- Change MirSurfaceParameters into MirWindowParameters.
 
  -- Timo Aaltonen   Tue, 07 Feb 2017 13:50:06 +0200
 
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index c094c00..ad15c0c 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -160,7 +160,7 @@
  
 --- /dev/null
 +++ b/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,637 @@
+@@ -0,0 +1,636 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -487,7 +487,7 @@
 +   struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
 +   struct dri2_egl_surface *dri2_surf;
 +   const __DRIconfig *config;
-+   MirSurfaceParameters surf_params;
++   MirWindowParameters win_params;
 +
 +   (void) drv;
 +
@@ -501,11 +501,11 @@
 +  

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Makefile.am|2 
 VERSION|2 
 bin/.cherry-ignore |   16 
 bin/get-pick-list.sh   |2 
 bin/get-typod-pick-list.sh |   39 +
 configure.ac   |4 
 debian/changelog   |   20 
 debian/patches/r600-sb-Fix-loop-optimization-related-hangs-on-eg.diff  |  387 
--
 debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff |   30 
 debian/patches/series  |4 
 debian/patches/vl-zscan-fix-Fix-trivial-sign-compare-warnings.diff |   28 
 debian/patches/workaround-binutils-mips-844357.diff|   43 -
 debian/source/local-options|2 
 docs/relnotes/13.0.3.html  |3 
 docs/relnotes/13.0.4.html  |  254 
++
 include/GL/internal/dri_interface.h|2 
 include/vulkan/vk_icd.h|  110 
++
 src/amd/common/ac_nir_to_llvm.c|4 
 src/amd/vulkan/Makefile.am |8 
 src/amd/vulkan/radv_cmd_buffer.c   |4 
 src/amd/vulkan/radv_device.c   |   45 +
 src/amd/vulkan/radv_wsi.c  |   12 
 src/compiler/glsl/opt_function_inlining.cpp|2 
 src/compiler/glsl/opt_minmax.cpp   |4 
 src/compiler/nir/nir_opt_undef.c   |   12 
 src/compiler/nir/nir_search.c  |   16 
 src/compiler/spirv/vtn_cfg.c   |3 
 src/egl/drivers/dri2/platform_wayland.c|6 
 src/egl/main/eglapi.c  |   10 
 src/egl/main/eglcontext.c  |   38 
 src/gallium/auxiliary/cso_cache/cso_context.c  |1 
 src/gallium/auxiliary/hud/hud_cpufreq.c|1 
 src/gallium/auxiliary/vl/vl_zscan.c|2 
 src/gallium/drivers/freedreno/freedreno_batch.c|2 
 src/gallium/drivers/freedreno/freedreno_batch_cache.c  |4 
 src/gallium/drivers/freedreno/freedreno_batch_cache.h  |2 
 src/gallium/drivers/freedreno/freedreno_context.c  |   17 
 src/gallium/drivers/freedreno/freedreno_context.h  |2 
 src/gallium/drivers/freedreno/freedreno_fence.c|7 
 src/gallium/drivers/freedreno/freedreno_fence.h|8 
 src/gallium/drivers/freedreno/freedreno_gmem.c |4 
 src/gallium/drivers/freedreno/freedreno_screen.c   |4 
 src/gallium/drivers/nouveau/nouveau_video.c|2 
 src/gallium/drivers/nouveau/nv30/nv30_clear.c  |2 
 src/gallium/drivers/nouveau/nv30/nv30_transfer.c   |8 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c|6 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c|2 
 src/gallium/drivers/nouveau/nv50/nv98_video.c  |6 
 src/gallium/drivers/nouveau/nv50/nv98_video_bsp.c  |7 
 src/gallium/drivers/nouveau/nv50/nv98_video_ppp.c  |7 
 src/gallium/drivers/nouveau/nv50/nv98_video_vp.c   |9 
 src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_video.c  |6 
 src/gallium/drivers/nouveau/nvc0/nvc0_video_bsp.c  |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_video_ppp.c  |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_video_vp.c   |9 
 src/gallium/drivers/r600/sb/sb_dce_cleanup.cpp |   25 
 src/gallium/drivers/r600/sb/sb_gcm.cpp |7 
 src/gallium/drivers/r600/sb/sb_ir.cpp  |4 
 src/gallium/drivers/r600/sb/sb_ir.h|   14 
 src/gallium/drivers/r600/sb/sb_pass.h  |6 
 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f7f9ea546fbdfd30fd5069de9cffa4216744c8fb
Author: Timo Aaltonen 
Date:   Fri Jan 20 07:43:01 2017 +0200

control: Lower debhelper build-dep to 9 for backports.

diff --git a/debian/changelog b/debian/changelog
index 22ccfe6..431850e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (13.0.3-1ubuntu4) UNRELEASED; urgency=medium
+
+  * control: Lower debhelper build-dep to 9 for backports.
+
+ -- Timo Aaltonen   Fri, 20 Jan 2017 07:42:58 +0200
+
 mesa (13.0.3-1ubuntu3) zesty; urgency=medium
 
   * control: Add dh-autoreconf back to build-deps, for backports.
diff --git a/debian/control b/debian/control
index 798148e..2338f1e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian X Strike Force 

 Uploaders: Andreas Boll 
 Standards-Version: 3.9.8
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 9),
  dh-autoreconf,
  quilt (>= 0.40),
  pkg-config,

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog   |8 
++
 debian/control |1 
 debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff |   30 
++
 debian/patches/series  |1 
 4 files changed, 40 insertions(+)

New commits:
commit 993161693815cf6961a0591ac92ae68542f371c3
Author: Timo Aaltonen 
Date:   Thu Jan 19 19:02:23 2017 +0200

release to zesty

diff --git a/debian/changelog b/debian/changelog
index 0ca469d..22ccfe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (13.0.3-1ubuntu3) UNRELEASED; urgency=medium
+mesa (13.0.3-1ubuntu3) zesty; urgency=medium
 
   * control: Add dh-autoreconf back to build-deps, for backports.
   * radeonsi-always-leave-poly-offset-in-a-valid-state.diff:
 Fix fdo#99451.
 
- -- Timo Aaltonen   Thu, 19 Jan 2017 18:58:15 +0200
+ -- Timo Aaltonen   Thu, 19 Jan 2017 18:59:24 +0200
 
 mesa (13.0.3-1ubuntu2) zesty; urgency=medium
 

commit 5213d54f20aba63438abfb734406a39ddd8c4f1d
Author: Timo Aaltonen 
Date:   Thu Jan 19 18:35:12 2017 +0200

radeonsi-always-leave-poly-offset-in-a-valid-state.diff: Fix fdo#99451.

diff --git a/debian/changelog b/debian/changelog
index 8a937ad..0ca469d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mesa (13.0.3-1ubuntu3) UNRELEASED; urgency=medium
 
   * control: Add dh-autoreconf back to build-deps, for backports.
+  * radeonsi-always-leave-poly-offset-in-a-valid-state.diff:
+Fix fdo#99451.
 
  -- Timo Aaltonen   Thu, 19 Jan 2017 18:58:15 +0200
 
diff --git 
a/debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff 
b/debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff
new file mode 100644
index 000..d757e53
--- /dev/null
+++ b/debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff
@@ -0,0 +1,30 @@
+commit d7d32b3bfe86bd89d94d59393907bce1cb9dab7c
+Author: Zachary Michaels 
+Date:   Thu Jan 19 10:50:16 2017 +0100
+
+radeonsi: Always leave poly_offset in a valid state
+
+This commit makes si_update_poly_offset set poly_offset to NULL if
+uses_poly_offset is false. This way poly_offset either points into the
+currently queued rasterizer, or it is NULL.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99451
+Cc: "13.0 17.0" 
+Reviewed-by: Nicolai Hähnle 
+
+diff --git a/src/gallium/drivers/radeonsi/si_state.c 
b/src/gallium/drivers/radeonsi/si_state.c
+index f60a499..0ec34f9 100644
+--- a/src/gallium/drivers/radeonsi/si_state.c
 b/src/gallium/drivers/radeonsi/si_state.c
+@@ -717,8 +717,10 @@ static void si_update_poly_offset_state(struct si_context 
*sctx)
+ {
+   struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
+ 
+-  if (!rs || !rs->uses_poly_offset || !sctx->framebuffer.state.zsbuf)
++  if (!rs || !rs->uses_poly_offset || !sctx->framebuffer.state.zsbuf) {
++  si_pm4_bind_state(sctx, poly_offset, NULL);
+   return;
++  }
+ 
+   /* Use the user format, not db_render_format, so that the polygon
+* offset behaves as expected by applications.
diff --git a/debian/patches/series b/debian/patches/series
index f0270f3..efe1e03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ i915-dont-default-to-2.1.patch
 0006-intel-blorp_blit-Enable-splitting-large-blorp-blits.patch
 0007-intel-blorp_blit-Add-split_blorp_blit_debug-switch.patch
 0008-i965-Increase-max-texture-to-16k-for-gen7.patch
+radeonsi-always-leave-poly-offset-in-a-valid-state.diff

commit b71ec237aa52f55a10d6da5b6af175ffb4fa0b14
Author: Timo Aaltonen 
Date:   Thu Jan 19 18:58:18 2017 +0200

control: Add dh-autoreconf back to build-deps, for backports.

diff --git a/debian/changelog b/debian/changelog
index 62c262d..8a937ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (13.0.3-1ubuntu3) UNRELEASED; urgency=medium
+
+  * control: Add dh-autoreconf back to build-deps, for backports.
+
+ -- Timo Aaltonen   Thu, 19 Jan 2017 18:58:15 +0200
+
 mesa (13.0.3-1ubuntu2) zesty; urgency=medium
 
   * rules: Drop forcing -O2 to fix ppc64el ftbfs, gcc got fixed already.
diff --git a/debian/control b/debian/control
index f500c7b..798148e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Andreas Boll 
 Standards-Version: 3.9.8
 Build-Depends:
  debhelper (>= 10),
+ dh-autoreconf,
  quilt (>= 0.40),
  pkg-config,
  libdrm-dev (>= 2.4.69) [!hurd-any],

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |7 +--
 debian/compat|2 +-
 debian/control   |6 +++---
 debian/rules |3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 3c38c5d4117b79bebd2e5c2c802b8f88cce9fd1b
Author: Timo Aaltonen 
Date:   Thu Jan 12 09:49:33 2017 +0200

release to zesty

diff --git a/debian/changelog b/debian/changelog
index 9a6a61e..62c262d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (13.0.3-1ubuntu2) UNRELEASED; urgency=medium
+mesa (13.0.3-1ubuntu2) zesty; urgency=medium
 
   * rules: Drop forcing -O2 to fix ppc64el ftbfs, gcc got fixed already.
 (LP: #1605796)
@@ -6,7 +6,7 @@ mesa (13.0.3-1ubuntu2) UNRELEASED; urgency=medium
   * compat,rules: Don't bump compat to 10, breaks applying patches
 before autoreconf which we need for the Mir EGL platform.
 
- -- Timo Aaltonen   Wed, 11 Jan 2017 19:01:00 +0200
+ -- Timo Aaltonen   Thu, 12 Jan 2017 09:49:20 +0200
 
 mesa (13.0.3-1ubuntu1) zesty; urgency=medium
 

commit 5fb138afff6aa05898e81b9102e2c6b74e956072
Author: Timo Aaltonen 
Date:   Thu Jan 12 09:40:49 2017 +0200

compat,rules: Don't bump compat to 10, breaks applying patches before 
autoreconf which we need for the Mir EGL platform.

diff --git a/debian/changelog b/debian/changelog
index befffd1..9a6a61e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mesa (13.0.3-1ubuntu2) UNRELEASED; urgency=medium
   * rules: Drop forcing -O2 to fix ppc64el ftbfs, gcc got fixed already.
 (LP: #1605796)
   * control: Fix dependencies for ubuntuBSD. (LP: #1565080)
+  * compat,rules: Don't bump compat to 10, breaks applying patches
+before autoreconf which we need for the Mir EGL platform.
 
  -- Timo Aaltonen   Wed, 11 Jan 2017 19:01:00 +0200
 
diff --git a/debian/compat b/debian/compat
index f599e28..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+9
diff --git a/debian/rules b/debian/rules
index a5eba40..7cce92c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -231,7 +231,8 @@ override_dh_makeshlibs:
dh_makeshlibs -a -- -c4
 
 %:
-   dh $@ --with quilt \
+   dh $@ --with quilt,autoreconf \
+   --parallel \
--builddirectory=build/
 
 # For maintainer use only, generate a tarball:

commit 55b77b0c58b66354c6eb0b621966245ea48619ad
Author: Timo Aaltonen 
Date:   Wed Jan 11 19:04:42 2017 +0200

control: Fix dependencies for ubuntuBSD. (LP: #1565080)

diff --git a/debian/changelog b/debian/changelog
index 5691a92..befffd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (13.0.3-1ubuntu2) UNRELEASED; urgency=medium
 
   * rules: Drop forcing -O2 to fix ppc64el ftbfs, gcc got fixed already.
 (LP: #1605796)
+  * control: Fix dependencies for ubuntuBSD. (LP: #1565080)
 
  -- Timo Aaltonen   Wed, 11 Jan 2017 19:01:00 +0200
 
diff --git a/debian/control b/debian/control
index 527b6f7..f500c7b 100644
--- a/debian/control
+++ b/debian/control
@@ -38,8 +38,8 @@ Build-Depends:
  libxcb-randr0-dev,
  libxcb-sync-dev,
  libxshmfence-dev (>= 1.1),
- libmirclient-dev,
- mir-client-platform-mesa-dev,
+ libmirclient-dev [linux-any],
+ mir-client-platform-mesa-dev [linux-any],
  python,
  python-mako,
  flex,
@@ -155,7 +155,7 @@ Depends:
  libxcb-sync-dev,
  libxshmfence-dev,
  libx11-xcb-dev,
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
+ libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el !kfreebsd-any !hurd-any],
  libwayland-dev (>= 1.2.0) [linux-any],
  ${misc:Depends},
 Multi-Arch: same

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |7 +++
 debian/rules |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 14030036fcec06a8f237c2e12b079c28492759a3
Author: Timo Aaltonen 
Date:   Wed Jan 11 19:01:06 2017 +0200

rules: Drop forcing -O2 to fix ppc64el ftbfs, gcc got fixed already. (LP: 
#1605796)

diff --git a/debian/changelog b/debian/changelog
index 812a26d..5691a92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (13.0.3-1ubuntu2) UNRELEASED; urgency=medium
+
+  * rules: Drop forcing -O2 to fix ppc64el ftbfs, gcc got fixed already.
+(LP: #1605796)
+
+ -- Timo Aaltonen   Wed, 11 Jan 2017 19:01:00 +0200
+
 mesa (13.0.3-1ubuntu1) zesty; urgency=medium
 
   * Merge from Debian.
diff --git a/debian/rules b/debian/rules
index da94876..a5eba40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture 
-qDEB_HOST_ARCH_CPU)
 
 ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
 buildflags = \
-   $(shell DEB_CFLAGS_MAINT_APPEND="-Wall -O2" 
DEB_CXXFLAGS_MAINT_APPEND="-Wall -O2" dpkg-buildflags --export=configure)
+   $(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall 
dpkg-buildflags --export=configure)
 else
 # Workaround for a variant of LP: #725126
 buildflags = \

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION
|2 
 debian/changelog   
|   47 +
 debian/compat  
|2 
 debian/control 
|8 
 debian/patches/0001-intel-blorp_blit-Create-structure-for-src-dst-coordi.patch 
|  137 +++
 debian/patches/0002-intel-blorp_blit-Split-blorp-blits-if-they-are-too-l.patch 
|  151 +++
 debian/patches/0003-intel-blorp_blit-Adjust-blorp-surface-parameters-for.patch 
|  160 
 debian/patches/0004-intel-blorp-Always-use-UINT-formats-on-SKL.patch   
|  140 +++
 debian/patches/0005-intel-blorp_blit-Move-RGB-R-conversion-to-follow-bli.patch 
|  173 
 debian/patches/0006-intel-blorp_blit-Enable-splitting-large-blorp-blits.patch  
|   87 ++
 debian/patches/0007-intel-blorp_blit-Add-split_blorp_blit_debug-switch.patch   
|   57 +
 debian/patches/0008-i965-Increase-max-texture-to-16k-for-gen7.patch
|   45 +
 debian/patches/r600-sb-Fix-loop-optimization-related-hangs-on-eg.diff  
|  387 ++
 debian/patches/series  
|   13 
 debian/patches/vl-zscan-fix-Fix-trivial-sign-compare-warnings.diff 
|   28 
 debian/rules   
|   17 
 debian/source/format   
|1 
 docs/relnotes/13.0.2.html  
|3 
 docs/relnotes/13.0.3.html  
|  176 
 src/amd/common/ac_nir_to_llvm.c
|2 
 src/amd/vulkan/radv_device.c   
|3 
 src/amd/vulkan/radv_meta_bufimage.c
|   27 
 src/compiler/Makefile.glsl.am  
|5 
 src/compiler/glsl/builtin_functions.cpp
|   12 
 src/compiler/glsl/link_uniforms.cpp
|2 
 src/compiler/glsl/linker.cpp   
|1 
 src/compiler/nir/nir_opt_undef.c   
|4 
 src/compiler/spirv/vtn_glsl450.c   
|   23 
 src/egl/main/eglapi.c  
|4 
 src/gallium/auxiliary/cso_cache/cso_cache.c
|4 
 src/gallium/auxiliary/tgsi/tgsi_info.c 
|1 
 src/gallium/drivers/radeon/r600_pipe_common.c  
|6 
 src/gallium/drivers/radeonsi/si_compute.c  
|1 
 src/gallium/drivers/radeonsi/si_descriptors.c  
|   19 
 src/gallium/drivers/radeonsi/si_pipe.c 
|5 
 src/gallium/drivers/radeonsi/si_shader.c   
|  183 +++-
 src/gallium/drivers/radeonsi/si_shader.h   
|2 
 src/gallium/drivers/radeonsi/si_state.c
|   25 
 src/gallium/drivers/radeonsi/si_state_draw.c   
|   24 
 src/gallium/drivers/radeonsi/si_state_shaders.c
|7 
 src/gallium/drivers/vc4/vc4_program.c  
|   27 
 src/intel/genxml/gen9.xml  
|2 
 src/intel/vulkan/anv_allocator.c   
|   27 
 src/intel/vulkan/anv_descriptor_set.c  
|1 
 src/intel/vulkan/anv_device.c  
|   52 -
 src/intel/vulkan/anv_gem.c 
|6 
 src/intel/vulkan/anv_image.c   
|   16 
 src/intel/vulkan/anv_private.h 
|   13 
 src/intel/vulkan/genX_cmd_buffer.c 
|   36 
 src/mesa/drivers/dri/i965/Makefile.am  
|7 
 src/mesa/drivers/dri/i965/brw_fs.cpp   
|   10 
 src/mesa/drivers/dri/i965/brw_fs.h 
|6 
 src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp  
|   19 
 src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp  
|8 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c  
|2 
 src/mesa/drivers/dri/i965/test_fs_copy_propagation.cpp

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION |2 
 bin/.cherry-ignore  |3 
 debian/changelog|   24 +
 debian/control  |1 
 debian/patches/series   |2 
 debian/patches/workaround-binutils-mips-844357.diff |   43 ++
 debian/rules|2 
 docs/relnotes/13.0.1.html   |3 
 docs/relnotes/13.0.2.html   |  188 
 include/pci_ids/i965_pci_ids.h  |   24 -
 src/amd/common/ac_nir_to_llvm.c |   28 +
 src/amd/vulkan/radv_cmd_buffer.c|1 
 src/amd/vulkan/radv_device.c|   18 -
 src/amd/vulkan/radv_formats.c   |1 
 src/amd/vulkan/radv_image.c |   35 +-
 src/amd/vulkan/radv_meta_clear.c|2 
 src/amd/vulkan/radv_wsi.c   |3 
 src/compiler/glsl/cache.c   |   11 
 src/compiler/glsl/glcpp/glcpp-parse.y   |   25 +
 src/compiler/glsl/glcpp/glcpp.h |9 
 src/compiler/glsl/glsl_lexer.ll |4 
 src/compiler/glsl/lower_output_reads.cpp|1 
 src/compiler/spirv/vtn_variables.c  |8 
 src/gallium/drivers/radeonsi/si_compute.c   |   13 
 src/gallium/drivers/vc4/vc4_context.h   |8 
 src/gallium/drivers/vc4/vc4_draw.c  |5 
 src/gallium/drivers/vc4/vc4_program.c   |   27 +
 src/gallium/drivers/vc4/vc4_qir.h   |1 
 src/gallium/drivers/vc4/vc4_qpu_emit.c  |5 
 src/gallium/drivers/vc4/vc4_register_allocate.c |5 
 src/gbm/backends/dri/gbm_dri.c  |2 
 src/intel/common/gen_device_info.c  |   48 +++
 src/intel/isl/isl.c |2 
 src/intel/vulkan/anv_blorp.c|   24 -
 src/intel/vulkan/anv_cmd_buffer.c   |6 
 src/intel/vulkan/anv_descriptor_set.c   |   12 
 src/intel/vulkan/anv_device.c   |  192 +++--
 src/intel/vulkan/anv_formats.c  |3 
 src/intel/vulkan/anv_genX.h |2 
 src/intel/vulkan/anv_image.c|   12 
 src/intel/vulkan/anv_intel.c|2 
 src/intel/vulkan/anv_pass.c |3 
 src/intel/vulkan/anv_pipeline.c |6 
 src/intel/vulkan/anv_pipeline_cache.c   |3 
 src/intel/vulkan/anv_private.h  |   15 -
 src/intel/vulkan/anv_query.c|3 
 src/intel/vulkan/anv_wsi.c  |   19 +
 src/intel/vulkan/gen8_cmd_buffer.c  |   29 ++
 src/intel/vulkan/genX_blorp_exec.c  |2 
 src/intel/vulkan/genX_cmd_buffer.c  |   65 
 src/mesa/drivers/dri/i965/brw_cs.c  |2 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp|2 
 src/mesa/drivers/dri/i965/brw_sampler_state.c   |   18 -
 src/mesa/drivers/dri/i965/brw_state.h   |9 
 src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp   |3 
 src/mesa/main/arbprogram.c  |   12 
 src/mesa/main/hash.c|   18 -
 src/mesa/main/pipelineobj.c |3 
 src/mesa/main/shaderapi.c   |   43 +-
 src/vulkan/wsi/Makefile.sources |3 
 src/vulkan/wsi/wsi_common.h |1 
 src/vulkan/wsi/wsi_common_queue.h   |  154 ++
 src/vulkan/wsi/wsi_common_wayland.c |   56 ++-
 src/vulkan/wsi/wsi_common_x11.c |  290 +---
 64 files changed, 1298 insertions(+), 268 deletions(-)

New commits:
commit 804e0e7cbb2a63c9d6e1a177e782c6c1c2040b16
Author: Timo Aaltonen 
Date:   Tue Nov 29 18:15:25 2016 +0200

release to zesty

diff --git a/debian/changelog b/debian/changelog
index 321cd08..358b736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (13.0.2-1ubuntu1) UNRELEASED; urgency=medium
+mesa (13.0.2-1ubuntu1) zesty; urgency=medium
 
   * Merge from Debian.
 
- -- Timo Aaltonen   Tue, 29 Nov 2016 18:14:42 +0200
+ -- Timo Aaltonen   Tue, 29 Nov 2016 18:15:09 +0200
 
 mesa (13.0.2-1) unstable; urgency=medium
 

commit 1d5644d9201a18bbd7aab510aa358907bec5b598
Author: Timo Aaltonen 
Date:   Tue Nov 29 18:15:05 2016 +0200

update changelog

diff --git a/debian/changelog b/debian/changelog
index 44e6b54..321cd08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (13.0.2-1ubuntu1) 

mesa: Changes to 'ubuntu-yakkety'

[Timo Aaltonen]

New branch 'ubuntu-yakkety' available with the following commits:
commit d7c140d51d78812a5c4040c72aa98161712eb35c
Author: Timo Aaltonen 
Date:   Thu Dec 8 10:45:59 2016 +0200

release to yakkety

commit 2946285c929484ddb16c7ec7bd8408df4e7360a8
Merge: b68d691 01579a9
Author: Timo Aaltonen 
Date:   Thu Dec 8 10:43:57 2016 +0200

Merge tag 'mesa-12.0.5' into ubuntu-yakkety

mesa-12.0.5

commit 01579a9d007830f2f905646c9d1f9bd0a03caa89
Author: Emil Velikov 
Date:   Mon Dec 5 15:31:47 2016 +

docs: add release notes for 12.0.5

Signed-off-by: Emil Velikov 

commit cd9a1165586df02e7a34a51addd590284e51d19e
Author: Emil Velikov 
Date:   Mon Dec 5 15:25:21 2016 +

Update version to 12.0.5

Signed-off-by: Emil Velikov 

commit 4a5cce8bd5b1dcf6b95b64c26ea361148964a152
Author: Marek Olšák 
Date:   Fri Dec 2 22:19:06 2016 +0100

radeonsi: silence runtime warnings with LLVM 3.9

Such as:
Warning: LLVM emitted unknown config register: 0x4

This is a non-intrusive back port of commit 0f7a6ea5e7b.

commit b4c28b17554bb4c1cf77b83f52ed4de7fbb45326
Author: Marek Olšák 
Date:   Sat Nov 26 15:52:05 2016 +0100

radeonsi: disable RB+ blend optimizations for dual source blending

This fixes dual source blending on Stoney. The fix was copied from Vulkan.
The problem was discovered during internal testing.

Cc: 13.0 
Reviewed-by: Nicolai Hähnle 
(cherry picked from commit 5e5573b1bf8565f38e9b770b5357d069e80ff00d)

commit 4f71f93878f6aca0fee09fe59449cfe453596b10
Author: Marek Olšák 
Date:   Sat Nov 26 15:43:39 2016 +0100

radeonsi: set CB_BLEND1_CONTROL.ENABLE for dual source blending

copied from Vulkan

Cc: 13.0 
Reviewed-by: Nicolai Hähnle 
(cherry picked from commit ff50c44a5fb4411715da828af5b8706c8a456d26)

commit a9e5a98c192db487cbad0b44f7c570e315529cb2
Author: Marek Olšák 
Date:   Sat Nov 26 15:39:06 2016 +0100

radeonsi: always set all blend registers

better safe than sorry

Cc: 13.0 
Reviewed-by: Nicolai Hähnle 
(cherry picked from commit 87b208a54e67b6b01845efa2ec20a96963399920)

Conflicts:
src/gallium/drivers/radeonsi/si_state.c

commit c1cb1844880f8fa72975de694ac404171e2e2677
Author: Nanley Chery 
Date:   Tue Nov 15 16:42:23 2016 -0800

mesa/fbobject: Update CubeMapFace when reusing textures

Framebuffer attachments can be specified through FramebufferTexture*
calls. Upon specifying a depth (or stencil) framebuffer attachment that
internally reuses a texture, the cube map face of the new attachment
would not be updated (defaulting to TEXTURE_CUBE_MAP_POSITIVE_X).
Fix this issue by actually updating the CubeMapFace field.

This bug manifested itself in BindFramebuffer calls performed on
framebuffers whose stencil attachments internally reused a depth
texture.  When binding a framebuffer, we walk through the framebuffer's
attachments and update each one's corresponding gl_renderbuffer. Since
the framebuffer's depth and stencil attachments may share a
gl_renderbuffer and the walk visits the stencil attachment after
the depth attachment, the uninitialized CubeMapFace forced rendering
to TEXTURE_CUBE_MAP_POSITIVE_X.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77662
Signed-off-by: Nanley Chery 
Reviewed-by: Brian Paul 
(cherry picked from commit 63318d34acd4a5edb271d57adf3b01e2e52552f8)

commit e3ef7da79ccc12df0cb45538592b682506c7f481
Author: Marek Olšák 
Date:   Wed Nov 30 15:06:08 2016 -0500

gallium/radeon: add support for sharing textures with DCC between processes

v2: use a function for calculating WORD1 of bo metadata

[Lyude]
On Fedora 24 and 25, I ended up noticing some rather nasty graphical
glitches on my desktop (using an R9 380 w/ amdgpu, Mesa version 12.0.4)
while I was in Wayland where the content of windows was garbled, as seen
here:


https://people.freedesktop.org/~lyudess/archive/11-30-2017/amdgpu-fix-example.png

After doing some reverse bisecting with Mesa v13, I ended up tracking
down the fix to this patch, which seems to fix the problem entirely on
all of the systems I've tested.

Reviewed-by: Nicolai Hähnle 
Tested-by: Lyude 
CC: "12.0" 
(cherry picked from commit 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 467c777827583709277b027171df1d91a08dc27a
Author: Timo Aaltonen 
Date:   Wed Nov 23 17:30:12 2016 +0200

release to zesty

diff --git a/debian/changelog b/debian/changelog
index 471e67d..cd9f261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (13.0.1-1ubuntu1) UNRELEASED; urgency=medium
+mesa (13.0.1-1ubuntu1) zesty; urgency=medium
 
   * Merge from Debian experimental.
   * dri3-fix-totem-with-libva.diff: Dropped, upstream.
   * egl-platform-mir.patch: Refreshed.
 
- -- Timo Aaltonen   Mon, 07 Nov 2016 10:57:41 +0200
+ -- Timo Aaltonen   Wed, 23 Nov 2016 16:36:34 +0200
 
 mesa (13.0.1-1) experimental; urgency=medium
 

commit b0430341c3629409820600b298f526baa3ec2b9f
Author: Timo Aaltonen 
Date:   Wed Nov 23 14:16:03 2016 +0200

release to zesty

diff --git a/debian/changelog b/debian/changelog
index 62d62bc..2c2b991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (12.0.4-2ubuntu1) UNRELEASED; urgency=medium
+mesa (12.0.4-2ubuntu1) zesty; urgency=medium
 
   * Merge from Debian
 - New upstream bugfix release. (LP: #1641017)
   * dri3-fix-totem-with-libva.diff: Dropped, upstream.
 
- -- Timo Aaltonen   Wed, 23 Nov 2016 11:40:25 +0200
+ -- Timo Aaltonen   Wed, 23 Nov 2016 14:04:45 +0200
 
 mesa (12.0.4-2) unstable; urgency=medium
 

commit 3a7a81f87420cceab148f1751974f59b8bbad3dc
Author: Timo Aaltonen 
Date:   Wed Nov 23 13:58:43 2016 +0200

update changelog

diff --git a/debian/changelog b/debian/changelog
index 4ab4474..62d62bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (12.0.4-2ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian
+- New upstream bugfix release. (LP: #1641017)
+  * dri3-fix-totem-with-libva.diff: Dropped, upstream.
+
+ -- Timo Aaltonen   Wed, 23 Nov 2016 11:40:25 +0200
+
 mesa (12.0.4-2) unstable; urgency=medium
 
   * Limit new glx symbols to !hurd-any. Should fix FTBFS on hurd.
diff --git a/debian/patches/dri3-fix-totem-with-libva.diff 
b/debian/patches/dri3-fix-totem-with-libva.diff
deleted file mode 100644
index 1da3c26..000
--- a/debian/patches/dri3-fix-totem-with-libva.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-From 5113845fae9b95dba0da59229a2e9947cef4196f Mon Sep 17 00:00:00 2001
-From: Martin Peres 
-Date: Tue, 4 Oct 2016 13:08:43 +0300
-Subject: [PATCH] [WIP] dri3: import prime buffers in the currently-bound
- screen
-
-This tries to mirrors the codepath taken by DRI2 in IntelSetTexBuffer2()
-and fixes many applications when using DRI3:
- - Totem with libva on hw-accelerated decoding
- - obs-studio, using Window Capture (Xcomposite) as a Source
- - gstreamer with VAAPI
-
-v2:
- - introduce get_dri_screen() in the dri3 loader's vtable (krh)
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759

- src/egl/drivers/dri2/platform_x11_dri3.c | 12 
- src/glx/dri3_glx.c   | 11 +++
- src/loader/loader_dri3_helper.c  | 12 +++-
- src/loader/loader_dri3_helper.h  |  1 +
- src/mesa/drivers/dri/i965/intel_screen.c |  1 +
- 5 files changed, 36 insertions(+), 1 deletion(-)
-
 a/src/egl/drivers/dri2/platform_x11_dri3.c
-+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
-@@ -103,6 +103,17 @@ egl_dri3_get_dri_context(struct loader_d
-return dri2_ctx->dri_context;
- }
- 
-+static __DRIscreen *
-+egl_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
-+{
-+   _EGLContext *ctx = _eglGetCurrentContext();
-+   struct dri2_egl_context *dri2_ctx;
-+   if (!ctx)
-+  return NULL;
-+   dri2_ctx = dri2_egl_context(ctx);
-+   return dri2_egl_display(dri2_ctx->base.Resource.Display)->dri_screen;
-+}
-+
- static void
- egl_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
- {
-@@ -119,6 +130,7 @@ static struct loader_dri3_vtable egl_dri
-.set_drawable_size = egl_dri3_set_drawable_size,
-.in_current_context = egl_dri3_in_current_context,
-.get_dri_context = egl_dri3_get_dri_context,
-+   .get_dri_screen = egl_dri3_get_dri_screen,
-.flush_drawable = egl_dri3_flush_drawable,
-.show_fps = NULL,
- };
 a/src/glx/dri3_glx.c
-+++ b/src/glx/dri3_glx.c
-@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_d
-return (gc != ) ? dri3Ctx->driContext : NULL;
- }
- 
-+static __DRIscreen *
-+glx_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
-+{
-+   struct glx_context *gc = __glXGetCurrentContext();
-+   struct dri3_context *pcp = (struct dri3_context *) 
__glXGetCurrentContext();
-+   struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc;
-+
-+   return (gc !=  && psc) ? psc->driScreen : NULL;
-+}
-+
- static void
- glx_dri3_flush_drawable(struct 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Android.common.mk |2 
 VERSION   |2 
 debian/changelog  |   24 +
 debian/libegl1-mesa.symbols   |2 
 debian/libgl1-mesa-glx.symbols|2 
 docs/relnotes/13.0.0.html |3 
 docs/relnotes/13.0.1.html |  187 ++
 src/amd/addrlib/addrtypes.h   |6 
 src/amd/common/ac_nir_to_llvm.c   |   29 +
 src/amd/vulkan/.gitignore |1 
 src/amd/vulkan/Makefile.am|   11 
 src/amd/vulkan/radeon_icd.json|7 
 src/amd/vulkan/radeon_icd.json.in |7 
 src/amd/vulkan/radv_device.c  |   44 ++
 src/amd/vulkan/radv_pipeline.c|   80 +++-
 src/compiler/Makefile.sources |1 
 src/compiler/glsl/linker.cpp  |   78 ++--
 src/compiler/glsl/lower_ubo_reference.cpp |   10 
 src/compiler/glsl/standalone.cpp  |2 
 src/compiler/glsl/standalone_scaffolding.cpp  |   10 
 src/compiler/glsl/standalone_scaffolding.h|3 
 src/compiler/nir/nir.h|2 
 src/compiler/nir/nir_lower_wpos_ytransform.c  |   24 +
 src/compiler/nir/nir_opt_conditional_discard.c|  125 +++
 src/egl/drivers/dri2/egl_dri2.h   |2 
 src/egl/main/eglapi.c |4 
 src/egl/main/egldefines.h |5 
 src/gallium/auxiliary/hud/hud_cpufreq.c   |   26 -
 src/gallium/auxiliary/hud/hud_diskstat.c  |   31 -
 src/gallium/auxiliary/hud/hud_nic.c   |   26 -
 src/gallium/auxiliary/hud/hud_sensors_temp.c  |   28 -
 src/gallium/drivers/radeonsi/si_blit.c|4 
 src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c |   37 +-
 src/gallium/drivers/vc4/vc4_program.c |2 
 src/gallium/state_trackers/vdpau/output.c |2 
 src/glx/g_glxglvnddispatchfuncs.c |  254 +++---
 src/glx/g_glxglvnddispatchindices.h   |   36 +-
 src/glx/glxcmds.c |4 
 src/glx/glxglvnd.c|3 
 src/glx/windows/Makefile.am   |3 
 src/intel/blorp/blorp.c   |   28 -
 src/intel/blorp/blorp.h   |5 
 src/intel/blorp/blorp_blit.c  |4 
 src/intel/blorp/blorp_clear.c |4 
 src/intel/blorp/blorp_genX_exec.h |   36 +-
 src/intel/blorp/blorp_priv.h  |   31 -
 src/intel/common/gen_device_info.c|   33 +
 src/intel/vulkan/anv_allocator.c  |  118 ++
 src/intel/vulkan/anv_batch_chain.c|  387 +++---
 src/intel/vulkan/anv_blorp.c  |9 
 src/intel/vulkan/anv_cmd_buffer.c |2 
 src/intel/vulkan/anv_device.c |  106 +++---
 src/intel/vulkan/anv_intel.c  |   11 
 src/intel/vulkan/anv_pipeline.c   |   20 -
 src/intel/vulkan/anv_pipeline_cache.c |   79 ++--
 src/intel/vulkan/anv_private.h|   77 ++--
 src/intel/vulkan/genX_cmd_buffer.c|   33 -
 src/mesa/drivers/dri/i965/brw_blorp.c |3 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |6 
 src/mesa/main/shaderobj.c |   23 -
 src/mesa/main/shaderobj.h |3 
 src/mesa/program/ir_to_mesa.cpp   |2 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|   10 
 src/mesa/state_tracker/st_sampler_view.c  |   15 
 src/mesa/state_tracker/st_texture.h   |9 
 src/mesa/state_tracker/st_vdpau.c |   20 -
 src/vulkan/wsi/wsi_common_x11.c   |6 
 67 files changed, 1448 insertions(+), 761 deletions(-)

New commits:
commit b67fbb0fc6e5b15a52cc73cd3afef8ccbe2cf278
Author: Timo Aaltonen 
Date:   Fri Nov 18 23:46:01 2016 +0200

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 5dd8d2c..8841fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,4 @@
-mesa (13.0.1-1) experimental; urgency=medium
-
-  * New upstream release.
-
- -- Andreas Boll   Mon, 14 Nov 2016 16:23:42 +0100
-
-mesa (13.0.0-1ubuntu1) UNRELEASED; urgency=medium
+mesa (13.0.1-1ubuntu1) UNRELEASED; urgency=medium
 
   * Merge from Debian experimental.
   * dri3-fix-totem-with-libva.diff: Dropped, upstream.
@@ -12,6 +6,12 @@ mesa (13.0.0-1ubuntu1) UNRELEASED; urgency=medium
 
  -- Timo Aaltonen   Mon, 07 Nov 2016 10:57:41 +0200
 
+mesa (13.0.1-1) experimental; urgency=medium
+
+  * New upstream 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .editorconfig  
 |   34 
 .gitignore 
 |1 
 .mailmap   
 |   12 
 .travis.yml
 |   29 
 Android.common.mk  
 |   10 
 Android.mk 
 |4 
 Makefile.am
 |3 
 REVIEWERS  
 |4 
 VERSION
 |2 
 bin/.cherry-ignore 
 |7 
 bin/.editorconfig  
 |3 
 common.py  
 |2 
 configure.ac   
 |  285 
 debian/changelog   
 |   63 
 debian/control 
 |   39 
 debian/libgl1-mesa-glx.symbols 
 |   12 
 debian/libgles2-mesa.symbols   
 |   13 
 debian/mesa-common-dev.install 
 |1 
 debian/mesa-vulkan-drivers.install 
 |2 
 debian/mesa-vulkan-drivers.lintian-overrides   
 |3 
 debian/not-installed   
 |1 
 debian/patches/egl-platform-mir.patch  
 |   86 
 debian/rules   
 |   22 
 debian/source/local-options
 |9 
 docs/GL3.txt   
 |  277 
 docs/developers.html   
 |2 
 docs/devinfo.html  
 |   22 
 docs/envvars.html  
 |   29 
 docs/faq.html  
 |2 
 docs/features.txt  
 |  337 
 docs/helpwanted.html   
 |4 
 docs/index.html
 |   25 
 docs/intro.html
 |   25 
 docs/relnotes.html 
 |4 
 docs/relnotes/12.0.1.html  
 |2 
 docs/relnotes/12.0.3.html  
 |3 
 docs/relnotes/13.0.0.html  
 |  310 
 docs/specs/EGL_MESA_platform_surfaceless.txt   
 |  120 
 docs/specs/MESA_configless_context.spec
 |8 
 docs/specs/MESA_shader_integer_functions.txt   
 |  520 
 docs/specs/OLD/EGL_MESA_screen_surface.txt 
 |  564 
 docs/specs/enums.txt   
 |   41 
 docs/xlibdriver.html   
 |2 
 include/D3D9/.editorconfig 
 |2 
 include/EGL/eglext.h   
 |  121 
 include/EGL/eglmesaext.h   
 |5 
 include/GL/glext.h 
 |9 
 include/GL/glxext.h
 |   36 
 include/GL/internal/dri_interface.h
 |4 
 include/GL/mesa_glinterop.h
 |   18 
 include/GL/wglext.h
 |6 
 include/GLES2/gl2.h
 |  152 
 include/GLES2/gl2ext.h 
 |  262 
 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49cc6e0debdf0fab7ae0b122d3f492267244794b
Author: Timo Aaltonen 
Date:   Fri Sep 16 12:36:19 2016 +0300

actually upload to yak

diff --git a/debian/changelog b/debian/changelog
index d34a8f8..164904e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (12.0.3-1ubuntu1) unstable; urgency=medium
+mesa (12.0.3-1ubuntu1) yakkety; urgency=medium
 
   * Merge from Debian.
 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 appveyor.yml  |2 
 debian/changelog  |   17 ++
 debian/rules  |4 -
 docs/relnotes/12.0.2.html |3 -
 docs/relnotes/12.0.3.html |   70 ++
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |   19 ++-
 7 files changed, 110 insertions(+), 7 deletions(-)

New commits:
commit 550f815d538542dcddbc11a02e30c36cc85aaeac
Author: Timo Aaltonen 
Date:   Fri Sep 16 10:12:26 2016 +0300

upload to yak

diff --git a/debian/changelog b/debian/changelog
index 04215d9..d34a8f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (12.0.3-1ubuntu1) UNRELEASED; urgency=medium
+mesa (12.0.3-1ubuntu1) unstable; urgency=medium
 
   * Merge from Debian.
 

commit 86dadc2a87a40878b35e9785a604dfcb4ff6fb3d
Author: Timo Aaltonen 
Date:   Fri Sep 16 10:11:09 2016 +0300

update changelog

diff --git a/debian/changelog b/debian/changelog
index daa5460..04215d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (12.0.3-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian.
+
+  [ Christopher James Halse Rogers ]
+  * egl-platform-mir.patch: Updated for upstream changes to dri2_initialize
+in egl_dri2.c. (LP: #1620934, #1620994)
+
+ -- Timo Aaltonen   Fri, 16 Sep 2016 10:07:05 +0300
+
 mesa (12.0.3-1) unstable; urgency=medium
 
   * New upstream release.

commit faf019854c61f38825a66646f2dec1e4a9c83659
Author: Andreas Boll 
Date:   Thu Sep 15 13:38:58 2016 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index b50fc5a..f074bf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (12.0.3-1) UNRELEASED; urgency=medium
+mesa (12.0.3-1) unstable; urgency=medium
 
   * New upstream release.
   * Enable vc4 on arm64.
 
- -- Andreas Boll   Thu, 15 Sep 2016 12:44:18 +0200
+ -- Andreas Boll   Thu, 15 Sep 2016 13:38:40 +0200
 
 mesa (12.0.2-1) unstable; urgency=medium
 

commit 8c0b6f98962ff261c1914c91bcb28750eaf7fcff
Author: Andreas Boll 
Date:   Thu Sep 8 11:31:40 2016 +0200

Enable vc4 on arm64.

diff --git a/debian/changelog b/debian/changelog
index 829b5db..b50fc5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (12.0.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Enable vc4 on arm64.
 
  -- Andreas Boll   Thu, 15 Sep 2016 12:44:18 +0200
 
diff --git a/debian/rules b/debian/rules
index 31ae0b4..09400d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,8 +52,8 @@ else
GALLIUM_DRIVERS += freedreno
endif
 
-   # vc4 kernel support is only available on armhf
-   ifneq (,$(filter $(DEB_HOST_ARCH),armhf))
+   # vc4 kernel support is only available on armhf and arm64
+   ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64))
GALLIUM_DRIVERS += vc4
endif
 

commit dcf808a86dca081492ceac7aafcdd81564711323
Author: Andreas Boll 
Date:   Thu Sep 15 12:44:38 2016 +0200

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index e1d4f3c..829b5db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (12.0.3-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Boll   Thu, 15 Sep 2016 12:44:18 +0200
+
 mesa (12.0.2-1) unstable; urgency=medium
 
   * New upstream release.

commit d79b2e7bf30ad6d1fa43f30940a64ed9fd0aa9c0
Author: Emil Velikov 
Date:   Thu Sep 15 10:18:54 2016 +0100

docs: add release notes for 12.0.3

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/12.0.3.html b/docs/relnotes/12.0.3.html
new file mode 100644
index 000..cc59a01
--- /dev/null
+++ b/docs/relnotes/12.0.3.html
@@ -0,0 +1,70 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 12.0.3 Release Notes / September 15, 2016
+
+
+Mesa 12.0.3 is a bug fix release which fixes bugs found since the 12.0.3 
release.
+
+
+Mesa 12.0.3 implements the OpenGL 4.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.3.  OpenGL
+4.3 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97781;>Bug 97781 

mesa: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/patches/egl-platform-mir.patch |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 031125e98fd6eae412042b4666e08ff2685eb414
Author: Christopher James Halse Rogers 
Date:   Fri Sep 16 15:47:03 2016 +1000

Fix egl-platform-mir mis-merge.

We were failing to initialise dri2_dpy->ref_count to 1 in eglInitialize, 
causing
a premature free and madness.

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 578dd8d..aa2a293 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -51,22 +51,23 @@
  struct __DRIdri2LoaderExtensionRec {
  __DRIextension base;
  
 a/src/egl/drivers/dri2/egl_dri2.c
-+++ b/src/egl/drivers/dri2/egl_dri2.c
-@@ -792,6 +792,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
-  return EGL_TRUE;
-   return dri2_initialize_wayland(drv, disp);
+Index: mesa-12.0.2/src/egl/drivers/dri2/egl_dri2.c
+===
+--- mesa-12.0.2.orig/src/egl/drivers/dri2/egl_dri2.c   2016-09-16 
12:11:30.975350268 +1000
 mesa-12.0.2/src/egl/drivers/dri2/egl_dri2.c2016-09-16 
13:57:41.750324740 +1000
+@@ -813,6 +813,11 @@
+   ret = dri2_initialize_wayland(drv, disp);
+   break;
  #endif
 +#ifdef HAVE_MIR_PLATFORM
 +   case _EGL_PLATFORM_MIR:
-+  if (disp->Options.TestOnly)
-+ return EGL_TRUE;
-+  return dri2_initialize_mir(drv, disp);
++  ret = dri2_initialize_mir(drv, disp);
++  break;
 +#endif
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
-   if (disp->Options.TestOnly)
-@@ -841,6 +847,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+   ret = dri2_initialize_android(drv, disp);
+@@ -876,6 +881,13 @@
}
break;
  #endif

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION|2 
 appveyor.yml   |4 
 bin/.cherry-ignore |3 
 configure.ac   |   80 -
 debian/changelog   |   33 
 debian/control |6 
 debian/copyright   |   14 
 debian/libegl1-mesa-dev.install|5 
 debian/libegl1-mesa-dev.install.in |6 
 debian/libegl1-mesa-dev.install.linux  |9 
 debian/libegl1-mesa-dev.install.linux.in   |   10 
 debian/libegl1-mesa.install|1 
 debian/libgbm-dev.install  |3 
 debian/libgbm-dev.install.in   |3 
 debian/libgbm1.install |1 
 debian/libgbm1.install.in  |1 
 debian/libgl1-mesa-dev.install |2 
 debian/libgl1-mesa-dev.install.in  |4 
 debian/libgl1-mesa-dri.install |1 
 debian/libgl1-mesa-dri.install.in  |1 
 debian/libgl1-mesa-glx.install |1 
 debian/libgl1-mesa-glx.symbols |1 
 debian/libglapi-mesa.install   |1 
 debian/libglapi-mesa.install.in|1 
 debian/libgles1-mesa-dev.install   |3 
 debian/libgles1-mesa-dev.install.in|4 
 debian/libgles1-mesa.install   |1 
 debian/libgles2-mesa-dev.install   |4 
 debian/libgles2-mesa-dev.install.in|6 
 debian/libgles2-mesa.install   |1 
 debian/libosmesa6-dev.install  |3 
 debian/libosmesa6-dev.install.in   |3 
 debian/libosmesa6.install  |1 
 debian/libosmesa6.install.in   |1 
 debian/libwayland-egl1-mesa.install|3 
 debian/libwayland-egl1-mesa.install.in |3 
 debian/libxatracker-dev.install|5 
 debian/libxatracker-dev.install.in |5 
 debian/libxatracker2.install   |1 
 debian/libxatracker2.install.in|1 
 debian/mesa-common-dev.install |   10 
 debian/mesa-common-dev.install.in  |   10 
 debian/mesa-opencl-icd.install |3 
 debian/mesa-opencl-icd.install.in  |3 
 debian/mesa-vulkan-drivers.postinst|6 
 debian/mesa-vulkan-drivers.postrm  |6 
 debian/mesa-vulkan-drivers.triggers|1 
 debian/rules   |   14 
 debian/source/local-options|   17 
 docs/relnotes/12.0.1.html  |3 
 docs/relnotes/12.0.2.html  |  402 
++
 src/compiler/glsl/glcpp/glcpp-parse.y  |   42 
 src/compiler/glsl/glcpp/glcpp.h|2 
 src/compiler/glsl/glcpp/tests/120-undef-builtin.c  |1 
 src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected |3 
 src/compiler/glsl/glcpp/tests/147-undef-builtin-allowed.c  |4 
 src/compiler/glsl/glcpp/tests/147-undef-builtin-allowed.c.expected |4 
 src/compiler/glsl/glsl_lexer.ll|8 
 src/compiler/glsl/glsl_parser.yy   |4 
 src/compiler/glsl/ir.h |7 
 src/compiler/glsl/ir_set_program_inouts.cpp|   10 
 src/compiler/glsl/link_varyings.cpp|   23 
 src/compiler/glsl/linker.cpp   |   15 
 src/compiler/glsl/lower_packed_varyings.cpp|   11 
 src/compiler/glsl/opt_conditional_discard.cpp  |9 
 src/compiler/glsl_types.cpp   

mesa: Changes to 'ubuntu-xenial'

[Timo Aaltonen]

 debian/changelog   |   10 
 debian/patches/add-more-kbl-pciids.diff|   34 +++
 debian/patches/bxt-add-2x6-variant.diff|   54 +
 debian/patches/remove-obsolete-kbl-pciids.diff |   35 
 debian/patches/series  |5 ++
 5 files changed, 138 insertions(+)

New commits:
commit 369d33e9537ebeffc757d8ddb3c96d49bd60d270
Author: Timo Aaltonen 
Date:   Thu Aug 4 14:14:24 2016 +0300

Update BXT/KBL pciids.

diff --git a/debian/changelog b/debian/changelog
index a3d3ba8..37176b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (11.2.0-1ubuntu2.2) xenial; urgency=medium
+
+  * bxt-add-2x6-variant.diff:
+Update BXT pciids. (LP: #1577735)
+  * add-more-kbl-pciids.diff,
+remove-obsolete-kbl-pciids.diff:
+Update i965 pciids. (LP: #1600124)
+
+ -- Timo Aaltonen   Wed, 03 Aug 2016 11:45:31 +0300
+
 mesa (11.2.0-1ubuntu2.1) xenial; urgency=medium
 
   * control, rules: Enable llvm/opencl on arm64. (LP: #1585942)
diff --git a/debian/patches/add-more-kbl-pciids.diff 
b/debian/patches/add-more-kbl-pciids.diff
new file mode 100644
index 000..116ee77
--- /dev/null
+++ b/debian/patches/add-more-kbl-pciids.diff
@@ -0,0 +1,34 @@
+commit bdff2e554735ed99173ad6ee1e9934ca37e409b1
+Author: Rodrigo Vivi 
+Date:   Thu Jun 23 14:35:09 2016 -0700
+
+i956: Add more Kabylake PCI IDs.
+
+The spec has been updated adding new PCI IDs.
+
+Reviewed-by: Dhinakaran Pandiyan 
+Acked-by: Kenneth Graunke 
+Signed-off-by: Rodrigo Vivi 
+
+diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h
+index fce00da..7a7897f 100644
+--- a/include/pci_ids/i965_pci_ids.h
 b/include/pci_ids/i965_pci_ids.h
+@@ -137,6 +137,7 @@ CHIPSET(0x193D, skl_gt4, "Intel(R) Iris Pro Graphics P580 
(Skylake GT4e)")
+ CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
+ CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
+ CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
++CHIPSET(0x5908, kbl_gt1, "Intel(R) Kabylake GT1")
+ CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
+ CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
+ CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
+@@ -149,7 +150,9 @@ CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
+ CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
+ CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
+ CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
++CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3")
+ CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3")
++CHIPSET(0x5927, kbl_gt3, "Intel(R) Kabylake GT3")
+ CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3")
+ CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3")
+ CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4")
diff --git a/debian/patches/bxt-add-2x6-variant.diff 
b/debian/patches/bxt-add-2x6-variant.diff
new file mode 100644
index 000..4d9dd98
--- /dev/null
+++ b/debian/patches/bxt-add-2x6-variant.diff
@@ -0,0 +1,54 @@
+commit f1fa8b4a1ca73fac4400e13b9aaca8c6b2955d2c
+Author: Ben Widawsky 
+Date:   Thu May 26 08:08:29 2016 -0700
+
+i965/bxt: Add 2x6 variant
+
+Cc: mesa-sta...@lists.freedesktop.org
+Signed-off-by: Ben Widawsky 
+Reviewed-by: Kristian Høgsberg 
+
+diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h
+index bd645fa..fce00da 100644
+--- a/include/pci_ids/i965_pci_ids.h
 b/include/pci_ids/i965_pci_ids.h
+@@ -162,4 +162,6 @@ CHIPSET(0x22B2, chv, "Intel(R) HD Graphics 
(Cherryview)")
+ CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)")
+ CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)")
+ CHIPSET(0x1A84, bxt, "Intel(R) HD Graphics (Broxton)")
++CHIPSET(0x1A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)")
+ CHIPSET(0x5A84, bxt, "Intel(R) HD Graphics (Broxton)")
++CHIPSET(0x5A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)")
+diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c 
b/src/mesa/drivers/dri/i965/brw_device_info.c
+index 3666190..77bbe78 100644
+--- a/src/mesa/drivers/dri/i965/brw_device_info.c
 b/src/mesa/drivers/dri/i965/brw_device_info.c
+@@ -401,6 +401,28 @@ static const struct brw_device_info brw_device_info_bxt = 
{
+}
+ };
+ 
++static const struct brw_device_info brw_device_info_bxt_2x6 = {
++   GEN9_FEATURES,
++   .is_broxton = 1,
++   .gt = 1,
++   .has_llc = false,
++
++   .num_slices = 1,
++   .max_vs_threads = 56, /* XXX: guess */
++   .max_hs_threads = 56, /* XXX: guess */
++   .max_ds_threads = 56,
++   .max_gs_threads = 56,
++   .max_wm_threads = 64 * 2,
++   .max_cs_threads = 6 * 6,
++   .urb = {
++  .size = 128,
++  .min_vs_entries = 34,
++  .max_vs_entries = 352,
++  .max_hs_entries = 128,
++  .max_ds_entries = 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |7 +++
 debian/control   |4 ++--
 debian/rules |2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit c6b0e2e5a4930f6cdcceb2fd1e25d4dda4c638bd
Author: Timo Aaltonen 
Date:   Wed Jul 20 11:01:14 2016 +0300

control, rules: Disable llvm on ppc64el again, FTBFS with gcc-5 this time.

diff --git a/debian/changelog b/debian/changelog
index d3ed5ff..21ca11c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (12.0.1-3ubuntu2) UNRELEASED; urgency=medium
+
+  * control, rules: Disable llvm on ppc64el again, FTBFS with gcc-5 this
+time.
+
+ -- Timo Aaltonen   Wed, 20 Jul 2016 10:59:57 +0300
+
 mesa (12.0.1-3ubuntu1) yakkety; urgency=medium
 
   * egl-platform-mir.patch: Don't enable support for ABGR. (LP:
diff --git a/debian/control b/debian/control
index 7e3ddb3..9f873f3 100644
--- a/debian/control
+++ b/debian/control
@@ -44,8 +44,8 @@ Build-Depends:
  libudev-dev [linux-any],
  flex,
  bison,
- llvm-3.8-dev (>= 1:3.8) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf 
ppc64el],
- libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el],
+ llvm-3.8-dev (>= 1:3.8) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf],
+ libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
  libclang-3.8-dev (>= 1:3.8) [amd64 i386 arm64 armhf],
  libclc-dev (>= 0.2.0+git20150813) [amd64 i386 arm64 armhf],
diff --git a/debian/rules b/debian/rules
index 3eea441..9dfb494 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,7 +93,7 @@ else
   endif
 
   # LLVM is required for r300g, radeonsi and llvmpipe:
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
arm64 armhf ppc64el))
+  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
arm64 armhf))
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.8

mesa: Changes to 'ubuntu-xenial'

[Timo Aaltonen]

New branch 'ubuntu-xenial' available with the following commits:
commit 02124bb9b1beb3c59c72f591ce224d22df0732fe
Author: Timo Aaltonen 
Date:   Tue Jul 19 10:54:41 2016 +0300

release to xenial

commit 70762e973161b7314a7caa595529c25b4f8a3104
Author: Timo Aaltonen 
Date:   Tue Jul 19 10:53:18 2016 +0300

control, rules: Enable llvm/opencl on arm64. (LP: #1585942)

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |   23 +++
 debian/control|4 ++--
 debian/not-installed  |4 +---
 debian/patches/egl-platform-mir.patch |   12 ++--
 debian/rules  |   16 +++-
 5 files changed, 39 insertions(+), 20 deletions(-)

New commits:
commit 6cf49938f1706f27e1f4f7643c8a39c9e8d262fa
Author: Timo Aaltonen 
Date:   Mon Jul 18 23:01:17 2016 +0300

release to yakkety

diff --git a/debian/changelog b/debian/changelog
index 0d05aa7..d3ed5ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (12.0.1-3ubuntu1) UNRELEASED; urgency=medium
+mesa (12.0.1-3ubuntu1) yakkety; urgency=medium
 
   * egl-platform-mir.patch: Don't enable support for ABGR. (LP:
 #1473901)

commit 1f09cb3c1f12d0698ded9061c4117e4030612388
Author: Timo Aaltonen 
Date:   Mon Jul 18 16:38:35 2016 +0300

upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 01452c2..251ab61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (12.0.1-3) UNRELEASED; urgency=medium
+mesa (12.0.1-3) experimental; urgency=medium
 
   * rules, control: Build mesa-vulkan-drivers only on linux-
 {amd64,i386,x32}.
 
- -- Timo Aaltonen   Mon, 18 Jul 2016 13:53:28 +0300
+ -- Timo Aaltonen   Mon, 18 Jul 2016 16:31:00 +0300
 
 mesa (12.0.1-2) experimental; urgency=medium
 

commit 098bc5bb1c0fa6de7263e6d28198801d68c4e6eb
Author: Timo Aaltonen 
Date:   Mon Jul 18 13:53:39 2016 +0300

rules, control: Build mesa-vulkan-drivers only on linux- {amd64,i386,x32}.

diff --git a/debian/changelog b/debian/changelog
index a071fcc..01452c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (12.0.1-3) UNRELEASED; urgency=medium
+
+  * rules, control: Build mesa-vulkan-drivers only on linux-
+{amd64,i386,x32}.
+
+ -- Timo Aaltonen   Mon, 18 Jul 2016 13:53:28 +0300
+
 mesa (12.0.1-2) experimental; urgency=medium
 
   * rules: Drop MESA_GIT_SHA1 hack because upstream uses build timestamp
diff --git a/debian/control b/debian/control
index ad62cf5..06cce61 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  libxext-dev,
  libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
  libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
- libvulkan-dev [!hurd-any],
+ libvulkan-dev [linux-amd64 linux-i386 linux-x32],
  autoconf,
  automake,
  libtool,
@@ -467,7 +467,7 @@ Description: Mesa VDPAU video acceleration drivers
 
 Package: mesa-vulkan-drivers
 Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: linux-amd64 linux-i386 linux-x32
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
  libvulkan1,
diff --git a/debian/rules b/debian/rules
index bbcbc5d..f6bf0e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,9 @@ else
 ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += nouveau
 endif
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
+   VULKAN_DRIVERS += intel
+endif
   endif
 
EGL_DISPLAYS += drm
@@ -72,7 +75,6 @@ else
   # Build intel drivers on archs where libdrm-intel is installed
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
x32))
DRI_DRIVERS += i915 i965
-   VULKAN_DRIVERS += intel
   endif
 
   ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
@@ -173,10 +175,12 @@ override_dh_install:
mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
   debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
 
-  #
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
x32))
+  # Remove vulkan headers only where they get installed in tmp
+  ifeq ($(DEB_HOST_ARCH_OS), linux)
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32))
set -e; for file in vk_platform.h vulkan.h vulkan_intel.h; do rm 
debian/tmp/usr/include/vulkan/$$file; done
rmdir debian/tmp/usr/include/vulkan
+endif
   endif
 
   ifneq ($(DEB_HOST_ARCH_OS), hurd)

commit d327c372843df90bc8cf16ff1cea76b627902b10
Author: Timo Aaltonen 
Date:   Mon Jul 18 11:45:18 2016 +0300

release to experimental

diff --git a/debian/changelog b/debian/changelog
index 8444deb..a071fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (12.0.1-2) UNRELEASED; urgency=medium
+mesa (12.0.1-2) experimental; urgency=medium
 
   * rules: Drop MESA_GIT_SHA1 hack because upstream uses build timestamp
 instead.
   * rules, not-installed: Handle removing unwanted vulkan headers in
 rules instead.
 
- -- Timo Aaltonen   Sun, 17 Jul 2016 06:11:25 +0300
+ -- Timo Aaltonen   Mon, 18 Jul 2016 11:45:01 +0300
 
 mesa (12.0.1-1) experimental; urgency=medium
 

commit e509edb361788008e9565c1fbea4158da4466353
Author: Timo 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 0f306c4b1c1b280798413aba62e186874994cf86
Author: Timo Aaltonen 
Date:   Mon Jul 18 10:17:13 2016 +0300

release to yakkety

diff --git a/debian/changelog b/debian/changelog
index 27590aa..6e2cbb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-mesa (12.0.1-1ubuntu1) UNRELEASED; urgency=medium
+mesa (12.0.1-1ubuntu1) yakkety; urgency=medium
 
   * Merge from debian experimental.
   * Rebase Mir egl platform patch.
+  * Re-enable llvm on ppc64el to see if unity tests work.
 
- -- Timo Aaltonen   Mon, 18 Jul 2016 08:07:33 +0300
+ -- Timo Aaltonen   Mon, 18 Jul 2016 08:37:54 +0300
 
 mesa (12.0.1-1) experimental; urgency=medium
 

commit 7db9b4c49c1cc978c5392fad255c5b97c058c107
Author: Timo Aaltonen 
Date:   Mon Jul 18 08:37:44 2016 +0300

rebase Mir egl patch

diff --git a/debian/changelog b/debian/changelog
index 7cc0678..27590aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (12.0.1-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from debian experimental.
+  * Rebase Mir egl platform patch.
+
+ -- Timo Aaltonen   Mon, 18 Jul 2016 08:07:33 +0300
+
 mesa (12.0.1-1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 4955db0..fd459f4 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,10 +1,8 @@
-Index: mesa/configure.ac
-===
 mesa.orig/configure.ac
-+++ mesa/configure.ac
-@@ -1824,7 +1824,9 @@ for plat in $egl_platforms; do
-   test "x$have_libdrm" != xyes &&
-   AC_MSG_ERROR([EGL platform surfaceless requires libdrm 
>= $LIBDRM_REQUIRED])
+--- a/configure.ac
 b/configure.ac
+@@ -2037,7 +2037,9 @@ for plat in $egl_platforms; do
+ 
+   android)
;;
 -
 +mir)
@@ -13,18 +11,16 @@ Index: mesa/configure.ac
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
;;
-@@ -1850,6 +1852,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND
+@@ -2063,6 +2065,7 @@ AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, ec
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_SURFACELESS, echo "$egl_platforms" | grep -q 
'surfaceless')
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null')
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_ANDROID, echo "$egl_platforms" | grep -q 
'android')
 +AM_CONDITIONAL(HAVE_EGL_PLATFORM_MIR, echo "$egl_platforms" | grep -q 'mir')
  
  AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
  
-Index: mesa/include/EGL/eglplatform.h
-===
 mesa.orig/include/EGL/eglplatform.h
-+++ mesa/include/EGL/eglplatform.h
+--- a/include/EGL/eglplatform.h
 b/include/EGL/eglplatform.h
 @@ -105,6 +105,13 @@ typedef struct ANativeWindow*
  typedef struct egl_native_pixmap_t* EGLNativePixmapType;
  typedef void*   EGLNativeDisplayType;
@@ -39,11 +35,9 @@ Index: mesa/include/EGL/eglplatform.h
  #elif defined(__unix__) || defined(__APPLE__)
  
  #if defined(MESA_EGL_NO_X11_HEADERS)
-Index: mesa/include/GL/internal/dri_interface.h
-===
 mesa.orig/include/GL/internal/dri_interface.h
-+++ mesa/include/GL/internal/dri_interface.h
-@@ -895,10 +895,12 @@ struct __DRIbufferRec {
+--- a/include/GL/internal/dri_interface.h
 b/include/GL/internal/dri_interface.h
+@@ -921,10 +921,12 @@ struct __DRIbufferRec {
  unsigned int pitch;
  unsigned int cpp;
  unsigned int flags;
@@ -57,11 +51,9 @@ Index: mesa/include/GL/internal/dri_interface.h
  struct __DRIdri2LoaderExtensionRec {
  __DRIextension base;
  
-Index: mesa/src/egl/drivers/dri2/egl_dri2.c
-===
 mesa.orig/src/egl/drivers/dri2/egl_dri2.c
-+++ mesa/src/egl/drivers/dri2/egl_dri2.c
-@@ -783,6 +783,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
+--- a/src/egl/drivers/dri2/egl_dri2.c
 b/src/egl/drivers/dri2/egl_dri2.c
+@@ -792,6 +792,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
   return EGL_TRUE;
return dri2_initialize_wayland(drv, disp);
  #endif
@@ -74,7 +66,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.c
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
if (disp->Options.TestOnly)
-@@ -832,6 +838,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+@@ -841,6 +847,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
}
break;
  #endif
@@ -88,7 +80,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.c
  #ifdef HAVE_WAYLAND_PLATFORM
 case _EGL_PLATFORM_WAYLAND:
   

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .gitignore 
   |3 
 .mailmap   
   |  460 
 Android.common.mk  
   |7 
 Android.mk 
   |   10 
 Makefile.am
   |8 
 REVIEWERS  
   |  106 
 SConstruct 
   |   19 
 VERSION
   |2 
 appveyor.yml   
   |3 
 bin/.cherry-ignore 
   |7 
 bin/bugzilla_mesa.sh   
   |2 
 common.py  
   |1 
 configure.ac   
   |  364 
 debian/changelog   
   |   22 
 debian/control 
   |   26 
 debian/libgbm1.symbols 
   |2 
 debian/libgl1-mesa-glx.symbols 
   |   52 
 debian/libgles2-mesa.symbols   
   |   83 
 debian/mesa-common-dev.install.in  
   |   20 
 debian/mesa-vulkan-drivers.install 
   |2 
 debian/mesa-vulkan-drivers.lintian-overrides   
   |2 
 debian/mesa-vulkan-drivers.postinst
   |6 
 debian/mesa-vulkan-drivers.postrm  
   |6 
 debian/not-installed   
   |5 
 debian/patches/egl-platform-mir.patch  
   |  128 
 debian/patches/gallivm-disable-avx512-features.diff
   |   23 
 debian/patches/series  
   |4 
 debian/rules   
   |   33 
 docs/COPYING   
   |  490 
 docs/GL3.txt   
   |  378 
 docs/download.html 
   |4 
 docs/egl.html  
   |8 
 docs/envvars.html  
   |4 
 docs/index.html
   |   27 
 docs/install.html  
   |3 
 docs/license.html  
   |   14 
 docs/relnotes.html 
   |5 
 docs/relnotes/11.1.3.html  
   |  319 
 docs/relnotes/11.1.4.html  
   |  182 
 docs/relnotes/11.2.0.html  
   |2 
 docs/relnotes/11.2.2.html  
   |3 
 docs/relnotes/12.0.0.html  
   |  335 
 docs/relnotes/12.0.1.html  
   |   66 
 docs/repository.html   
   |   34 
 docs/shading.html  
   |   45 
 docs/systems.html  
   |3 
 docs/utilities.html
   |2 
 doxygen/.gitignore 
   |8 
 doxygen/Makefile   
   |7 
 doxygen/common.doxy
   |   51 
 doxygen/core_subset.doxy   
   |3 
 doxygen/doxy.bat   
   |9 
 

mesa: Changes to 'ubuntu-xenial-lts'

[Timo Aaltonen]

New branch 'ubuntu-xenial-lts' available with the following commits:
commit b75b2d70b4ed3b38d11c4c75f97c94845f320a51
Author: Timo Aaltonen 
Date:   Tue May 3 15:31:17 2016 +0300

lts-xenial packaging

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Android.common.mk  |2 
 VERSION|2 
 bin/.cherry-ignore |5 
 configure.ac   |4 
 debian/changelog   |   40 ++
 debian/control |8 
 debian/patches/gallivm-disable-avx512-features.diff|   23 +
 debian/patches/series  |3 
 docs/relnotes/11.2.0.html  |3 
 docs/relnotes/11.2.1.html  |  119 +++
 docs/relnotes/11.2.2.html  |  209 +
 include/D3D9/d3d9types.h   |   16 
 src/compiler/glsl/glsl_lexer.ll|2 
 src/compiler/glsl/linker.cpp   |1 
 src/compiler/glsl/lower_variable_index_to_cond_assign.cpp  |   20 +
 src/compiler/glsl/lower_vec_index_to_swizzle.cpp   |   96 -
 src/egl/drivers/dri2/platform_x11.c|  104 +++---
 src/gallium/auxiliary/gallivm/lp_bld_arit.c|9 
 src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c  |   13 
 src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c  |   38 +-
 src/gallium/auxiliary/tgsi/tgsi_dump.c |7 
 src/gallium/auxiliary/util/u_blitter.c |2 
 src/gallium/drivers/llvmpipe/lp_state_fs.c |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp |   49 ++-
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp  |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp   |2 
 src/gallium/drivers/nouveau/nouveau_vp3_video.c|   25 +
 src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c   |   20 -
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c |2 
 src/gallium/drivers/r600/evergreen_state.c |   33 +-
 src/gallium/drivers/r600/r600_pipe.h   |8 
 src/gallium/drivers/r600/r600_shader.c |   11 
 src/gallium/drivers/r600/r600_state.c  |   27 +
 src/gallium/drivers/r600/r600_state_common.c   |   65 +++-
 src/gallium/drivers/radeon/r600_buffer_common.c|4 
 src/gallium/drivers/radeon/r600_pipe_common.h  |2 
 src/gallium/drivers/radeon/r600_streamout.c|   13 
 src/gallium/drivers/radeon/r600_texture.c  |   24 -
 src/gallium/drivers/radeon/radeon_uvd.c|   14 
 src/gallium/drivers/radeonsi/si_descriptors.c  |2 
 src/gallium/drivers/radeonsi/si_state.c|   26 +
 src/gallium/drivers/vc4/vc4_program.c  |1 
 src/gallium/drivers/vc4/vc4_resource.c |3 
 src/gallium/drivers/vc4/vc4_screen.c   |7 
 src/gallium/drivers/vc4/vc4_tiling.c   |8 
 src/gallium/state_trackers/va/context.c|4 
 src/gallium/state_trackers/va/image.c  |4 
 src/gallium/winsys/sw/dri/dri_sw_winsys.c  |2 
 src/gallium/winsys/sw/xlib/xlib_sw_winsys.c|2 
 src/glx/dri2_glx.c |2 
 src/glx/dri3_glx.c |8 
 src/mapi/glapi/glapi_getproc.c |   18 -
 src/mesa/drivers/dri/common/dri_util.c |   25 +
 src/mesa/drivers/dri/common/drirc  |8 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp   |8 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp   |   10 
 src/mesa/drivers/dri/i965/brw_meta_fast_clear.c|1 
 src/mesa/drivers/dri/i965/brw_shader.cpp   |3 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |   14 
 src/mesa/drivers/dri/i965/gen7_blorp.cpp   |   30 +
 src/mesa/drivers/dri/i965/intel_tiled_memcpy.c |  198 ++--
 src/mesa/state_tracker/st_cb_bitmap.c  |6 
 src/mesa/state_tracker/st_cb_drawpixels.c  |   23 +
 src/mesa/state_tracker/st_cb_fbo.c |2 
 src/mesa/state_tracker/st_cb_texture.c |3 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |   22 +
 src/util/macros.h  |6 
 67 files changed, 1064 insertions(+), 413 deletions(-)

New commits:
commit e0d962f40f1417bcf36bda8453a1f518d0ccab00
Author: Timo Aaltonen 
Date:   Fri May 13 10:50:50 2016 +0300

upload to yakkety

diff --git a/debian/changelog b/debian/changelog
index a1fe669..bed9604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog   |7 +++
 debian/control |   25 +++-
 debian/patches/glibc2.23-pthreads-compat.patch |   52 -
 debian/patches/series  |1 
 debian/rules   |2 
 5 files changed, 31 insertions(+), 56 deletions(-)

New commits:
commit 76d1c27c96f7b85be2c06c80b03798d7fb3ed370
Author: Timo Aaltonen 
Date:   Thu Apr 14 14:21:04 2016 +0300

release to xenial

diff --git a/debian/changelog b/debian/changelog
index b67c37a..443652b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (11.2.0-1ubuntu2) UNRELEASED; urgency=medium
+mesa (11.2.0-1ubuntu2) xenial; urgency=medium
 
   * control, rules: Enable mesa-opencl-icd now that the archive reorg
 allows to build-depend on packages from universe. (LP: #1319835)
 
- -- Timo Aaltonen   Thu, 14 Apr 2016 14:08:04 +0300
+ -- Timo Aaltonen   Thu, 14 Apr 2016 14:20:56 +0300
 
 mesa (11.2.0-1ubuntu1) xenial; urgency=medium
 

commit 21ced314d3dc22f68e67de84e5bb97c48c71c4e3
Author: Timo Aaltonen 
Date:   Thu Apr 14 14:20:54 2016 +0300

control, rules: Enable mesa-opencl-icd now that the archive reorg allows to 
build-depend on packages from universe. (LP: #1319835)

diff --git a/debian/changelog b/debian/changelog
index add406c..b67c37a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.2.0-1ubuntu2) UNRELEASED; urgency=medium
+
+  * control, rules: Enable mesa-opencl-icd now that the archive reorg
+allows to build-depend on packages from universe. (LP: #1319835)
+
+ -- Timo Aaltonen   Thu, 14 Apr 2016 14:08:04 +0300
+
 mesa (11.2.0-1ubuntu1) xenial; urgency=medium
 
   * Merge from debian. (LP: #1481832. #1548845)
diff --git a/debian/control b/debian/control
index f5edbb8..fcf8c94 100644
--- a/debian/control
+++ b/debian/control
@@ -45,8 +45,8 @@ Build-Depends:
  llvm-3.8-dev (>= 1:3.8~) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
-# libclang-3.7-dev (>= 1:3.7~+rc2) [amd64 i386 armhf],
-# libclc-dev [amd64 i386 armhf],
+ libclang-3.8-dev (>= 1:3.8~) [amd64 i386 armhf],
+ libclc-dev [amd64 i386 armhf],
  mir-client-platform-mesa-dev,
  libmirclient-dev,
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
@@ -471,5 +471,26 @@ Description: Mesa VDPAU video acceleration drivers
  .
  This package enables support for VDPAU for some gallium drivers.
 
+Package: mesa-opencl-icd
+Section: libs
+Architecture: amd64 i386 armhf
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ libclc-r600 (>= 0.2.0+git20150813),
+ libclc-amdgcn,
+ ocl-icd-libopencl1 | libopencl1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Replaces:
+ libgl1-mesa-dri (<< 10.3.0-1),
+Breaks:
+ libgl1-mesa-dri (<< 10.3.0-1),
+Provides: opencl-icd
+Multi-Arch: same
+Description: free implementation of the OpenCL API -- ICD runtime
+ This package contains the mesa implementation of the OpenCL (Open Compute
+ Language) library, which is intended for use with an ICD loader. OpenCL
+ provides a standardized interface for computational analysis on graphical
+ processing units.
 
 # vim: tw=0
diff --git a/debian/rules b/debian/rules
index 43815a4..4772824 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ else
# so no opencl on kfreebsd.
# opencl needs LLVM and Clang, so only build it on the subset
# of arches where we have LLVM enabled.
-#  confflags_GALLIUM += --enable-opencl --enable-opencl-icd
+   confflags_GALLIUM += --enable-opencl --enable-opencl-icd
   endif
 
   # LLVM is required for r300g, radeonsi and llvmpipe:

commit faff76fdf5fe7072eac84126b341f88cd6beac7f
Author: Timo Aaltonen 
Date:   Thu Apr 14 14:13:42 2016 +0300

drop an obsolete patch from 11.1.x

diff --git a/debian/patches/glibc2.23-pthreads-compat.patch 
b/debian/patches/glibc2.23-pthreads-compat.patch
deleted file mode 100644
index 9c8a984..000
--- a/debian/patches/glibc2.23-pthreads-compat.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: fix misuse of pthread_barrier API
- If we are not spawning any threads, it's incorrect to call
- pthread_barrier_init() with a count of zero.  Guard the use of
- pipe_barrier_* so that we don't make API violating calls (SIGFPE on
- x86 with glibc 2.23 and above).
-Author: Steve Langasek 
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1559842
-
-Index: mesa-11.1.2/src/gallium/drivers/llvmpipe/lp_rast.c
-===
 mesa-11.1.2.orig/src/gallium/drivers/llvmpipe/lp_rast.c
-+++ mesa-11.1.2/src/gallium/drivers/llvmpipe/lp_rast.c
-@@ -819,7 +819,8 @@
-   /* Wait for all threads to get here so that threads[1+] don't
-

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .dir-locals.el 
 |1 
 .travis.yml
 |  101 
 Android.common.mk  
 |   16 
 Android.mk 
 |   11 
 Makefile.am
 |8 
 VERSION
 |2 
 appveyor.yml   
 |   73 
 bin/.cherry-ignore 
 |9 
 bin/get-extra-pick-list.sh 
 |   35 
 configure.ac   
 |  111 
 debian/changelog   
 |   56 
 debian/control 
 |  221 
 debian/libegl1-mesa-dev.install.in 
 |8 
 debian/libegl1-mesa-dev.install.linux.in   
 |   12 
 debian/libegl1-mesa.install.in 
 |2 
 debian/libgbm-dev.install.in   
 |6 
 debian/libgbm1.install.in  
 |2 
 debian/libgl1-mesa-dev.install.in  
 |6 
 debian/libgl1-mesa-dri.install.in  
 |2 
 debian/libgl1-mesa-glx.install.in  
 |2 
 debian/libgl1-mesa-glx.symbols 
 |3 
 debian/libglapi-mesa.install.in
 |2 
 debian/libgles1-mesa-dev.install.in
 |6 
 debian/libgles1-mesa.install.in
 |2 
 debian/libgles2-mesa-dev.install.in
 |8 
 debian/libgles2-mesa.install.in
 |2 
 debian/libosmesa6-dev.install.in   
 |6 
 debian/libosmesa6.install.in   
 |2 
 debian/libwayland-egl1-mesa.install.in 
 |4 
 debian/libxatracker-dev.install.in 
 |   10 
 debian/libxatracker2.install.in
 |2 
 debian/mesa-common-dev.install.in  
 |   20 
 debian/mesa-opencl-icd.install.in  
 |3 
 debian/not-installed   
 |2 
 debian/patches/docs-Replace-sourceforge-logo-with-a-text-link.patch
 |   73 
 debian/patches/glapi-Build-glapi_gentable.c-only-on-Darwin.patch   
 |  137 
 debian/patches/glibc2.23-pthreads-compat.patch 
 |   52 
 debian/patches/series  
 |6 
 debian/rules   
 |  155 
 debian/watch   
 |2 
 docs/GL3.txt   
 |   66 
 docs/contents.html 
 |4 
 docs/envvars.html  
 |   30 
 docs/index.html
 |   46 
 docs/install.html  
 |5 
 docs/relnotes.html  

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 1b344fd537edad2ba58f82a67e9f701fc29d6445
Author: Timo Aaltonen 
Date:   Thu Feb 25 10:36:52 2016 +0200

control: Add dh-autoreconf to build-depends.

diff --git a/debian/changelog b/debian/changelog
index c03a20c..bbc3568 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mesa (11.2.0~rc1-1) UNRELEASED; urgency=medium
 everything in one pass nowadays.
   * control: Bump libdrm-dev build-dep to 2.4.67 for freedreno.
   * rules: Migrate to dh.
+  * control: Add dh-autoreconf to build-depends.
 
  -- Timo Aaltonen   Tue, 23 Feb 2016 09:48:38 +0200
 
diff --git a/debian/control b/debian/control
index b098b95..f81c7d3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Andreas Boll 
 Standards-Version: 3.9.6
 Build-Depends:
  debhelper (>= 9),
+ dh-autoreconf,
  quilt (>= 0.40),
  pkg-config,
  libdrm-dev (>= 2.4.67) [!hurd-any],

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 debian/changelog |7 +++
 debian/control   |1 +
 2 files changed, 8 insertions(+)

New commits:
commit b229368f7b5ed31a6d3a2c016a73d8364370acef
Author: Timo Aaltonen 
Date:   Thu Feb 25 09:56:40 2016 +0200

control: Add dh-autoreconf to build-depends.

diff --git a/debian/changelog b/debian/changelog
index c03a20c..bbc3568 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mesa (11.2.0~rc1-1) UNRELEASED; urgency=medium
 everything in one pass nowadays.
   * control: Bump libdrm-dev build-dep to 2.4.67 for freedreno.
   * rules: Migrate to dh.
+  * control: Add dh-autoreconf to build-depends.
 
  -- Timo Aaltonen   Tue, 23 Feb 2016 09:48:38 +0200
 
diff --git a/debian/control b/debian/control
index b098b95..f81c7d3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Andreas Boll 
 Standards-Version: 3.9.6
 Build-Depends:
  debhelper (>= 9),
+ dh-autoreconf,
  quilt (>= 0.40),
  pkg-config,
  libdrm-dev (>= 2.4.67) [!hurd-any],

commit 5cbf7568917680dbc4dbb0c1cce1b11508e99b89
Author: Timo Aaltonen 
Date:   Thu Feb 25 09:55:42 2016 +0200

update changelog

diff --git a/debian/changelog b/debian/changelog
index b7d0d23..4b11084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.2.0~rc1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from experimental.
+
+ -- Timo Aaltonen   Thu, 25 Feb 2016 09:44:28 +0200
+
 mesa (11.2.0~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 .dir-locals.el 
 |1 
 .travis.yml
 |  101 
 Android.common.mk  
 |   12 
 Android.mk 
 |5 
 Makefile.am
 |1 
 VERSION
 |2 
 appveyor.yml   
 |   73 
 configure.ac   
 |  130 
 debian/changelog   
 |   70 
 debian/control 
 |  210 
 debian/libegl1-mesa-dev.install.in 
 |8 
 debian/libegl1-mesa-dev.install.linux.in   
 |   12 
 debian/libegl1-mesa.install.in 
 |2 
 debian/libgbm-dev.install.in   
 |6 
 debian/libgbm1.install.in  
 |2 
 debian/libgl1-mesa-dev.install.in  
 |6 
 debian/libgl1-mesa-dri.install.in  
 |2 
 debian/libgl1-mesa-glx.install.in  
 |2 
 debian/libgl1-mesa-glx.symbols 
 |7 
 debian/libglapi-mesa.install.in
 |2 
 debian/libgles1-mesa-dev.install.in
 |6 
 debian/libgles1-mesa.install.in
 |2 
 debian/libgles2-mesa-dev.install.in
 |8 
 debian/libgles2-mesa.install.in
 |2 
 debian/libosmesa6-dev.install.in   
 |6 
 debian/libosmesa6.install.in   
 |2 
 debian/libwayland-egl1-mesa.install.in 
 |4 
 debian/libxatracker-dev.install.in 
 |   10 
 debian/libxatracker2.install.in
 |2 
 debian/mesa-common-dev.install.in  
 |   19 
 debian/mesa-opencl-icd.install.in  
 |3 
 debian/not-installed   
 |2 
 debian/patches/docs-Replace-sourceforge-logo-with-a-text-link.patch
 |   73 
 debian/patches/glapi-Build-glapi_gentable.c-only-on-Darwin.patch   
 |  137 
 debian/patches/series  
 |5 
 debian/rules   
 |  151 
 docs/GL3.txt   
 |   66 
 docs/contents.html 
 |4 
 docs/envvars.html  
 |   30 
 docs/index.html
 |   46 
 docs/install.html  
 |5 
 docs/relnotes.html 
 |6 
 docs/relnotes/11.0.5.html  
 |2 
 docs/relnotes/11.0.7.html  
 |  154 
 docs/relnotes/11.0.8.html  
 |  200 
 docs/relnotes/11.0.9.html   

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION  |2 
 bin/.cherry-ignore   |4 
 debian/changelog |   20 +
 debian/control   |2 
 debian/libgl1-mesa-glx.symbols   |4 
 debian/rules |2 
 docs/relnotes/11.1.1.html|3 
 docs/relnotes/11.1.2.html|  181 +++
 src/egl/drivers/dri2/egl_dri2.c  |2 
 src/gallium/auxiliary/pipe-loader/SConscript |9 
 src/gallium/auxiliary/pipe-loader/pipe_loader.c  |5 
 src/gallium/auxiliary/util/u_cpu_detect.c|2 
 src/gallium/auxiliary/util/u_pstipple.c  |1 
 src/gallium/auxiliary/vl/vl_zscan.c  |7 
 src/gallium/auxiliary/vl/vl_zscan.h  |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp   |3 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c  |  120 -
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c  |  179 --
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c  |   16 +
 src/gallium/drivers/r600/r600_pipe.c |6 
 src/gallium/drivers/radeonsi/si_descriptors.c|   33 +-
 src/gallium/drivers/radeonsi/si_shader.c |3 
 src/gallium/drivers/radeonsi/si_state_shaders.c  |   85 ---
 src/gallium/drivers/vc4/vc4_job.c|   11 
 src/gallium/state_trackers/omx/vid_dec_h264.c|7 
 src/gallium/targets/dri/Android.mk   |4 
 src/glsl/ast_to_hir.cpp  |   48 +++
 src/glsl/ir.h|7 
 src/glsl/link_varyings.cpp   |   43 ++-
 src/glsl/linker.cpp  |2 
 src/glsl/lower_subroutine.cpp|   24 +
 src/mesa/drivers/common/meta.c   |   12 
 src/mesa/drivers/common/meta.h   |2 
 src/mesa/drivers/common/meta_blit.c  |   35 +-
 src/mesa/drivers/common/meta_generate_mipmap.c   |   26 +-
 src/mesa/drivers/dri/i915/intel_buffer_objects.c |2 
 src/mesa/drivers/dri/i915/intel_context.c|2 
 src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp  |2 
 src/mesa/drivers/dri/i965/brw_device_info.c  |2 
 src/mesa/drivers/dri/i965/brw_fs.cpp |6 
 src/mesa/drivers/dri/i965/brw_fs.h   |4 
 src/mesa/drivers/dri/i965/brw_fs_generator.cpp   |   16 +
 src/mesa/drivers/dri/i965/brw_vec4.cpp   |2 
 src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp|2 
 src/mesa/drivers/dri/i965/brw_vec4_nir.cpp   |6 
 src/mesa/drivers/dri/i965/intel_buffer_objects.c |2 
 src/mesa/drivers/dri/radeon/radeon_buffer_objects.c  |2 
 src/mesa/main/bufferobj.c|2 
 src/mesa/main/bufferobj.h|4 
 src/mesa/main/shaderapi.c|   10 
 src/mesa/state_tracker/st_cb_bufferobjects.c |4 
 src/mesa/state_tracker/st_cb_texture.c   |   10 
 src/mesa/state_tracker/st_gen_mipmap.c   |8 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp   |5 
 55 files changed, 807 insertions(+), 197 deletions(-)

New commits:
commit 583578934ac6bf132293bac13924510be5f8c00a
Author: Timo Aaltonen 
Date:   Thu Feb 11 13:36:17 2016 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index 295bccc..0c201cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.1.2-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian.
+  * control, rules: Use llvm-3.8 for OpenGL 4.1 support. (LP: #1535500)
+
+ -- Timo Aaltonen   Tue, 09 Feb 2016 13:40:00 +0200
+
 mesa (11.1.2-1) unstable; urgency=medium
 
   * New upstream release.
@@ -11,12 +18,6 @@ mesa (11.1.1-2) unstable; urgency=medium
 
  -- Andreas Boll   Fri, 15 Jan 2016 18:44:52 +0100
 
-mesa (11.1.1-1ubuntu3) xenial; urgency=medium
-
-  * control, rules: Use llvm-3.8 for OpenGL 4.1 support. (LP: #1535500)
-
- -- Timo Aaltonen   Tue, 09 Feb 2016 13:40:00 +0200
-
 mesa (11.1.1-1ubuntu2) xenial; urgency=medium
 
   * Remove architecture restrictions on Mir EGL platform;

commit 487e085acd106f1c208cdf5eb1ed28f15c3fd083
Author: Timo Aaltonen 
Date:   Thu Feb 11 13:25:27 2016 +0200

release to unstable

diff --git a/debian/changelog 

mesa: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog |7 +++
 debian/control   |4 ++--
 debian/rules |5 +
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit eabf21e11a617744db1c38aa081efb323a80f627
Author: Christopher James Halse Rogers 
Date:   Thu Jan 21 17:40:21 2016 -0600

Remove architecture restriction from Mir EGL platform patch

diff --git a/debian/changelog b/debian/changelog
index 6dd3b58..87204ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.1.1-1ubuntu2) xenial; urgency=medium
+
+  * Remove architecture restrictions on Mir EGL platform;
+Mir is now built everywhere.
+
+ -- Christopher James Halse Rogers   Thu, 21 Jan 2016 
17:07:05 -0600
+
 mesa (11.1.1-1ubuntu1) xenial; urgency=medium
 
   * Merge from Debian.
diff --git a/debian/control b/debian/control
index 77b9001..c63a749 100644
--- a/debian/control
+++ b/debian/control
@@ -45,8 +45,8 @@ Build-Depends:
  libwayland-dev (>= 1.2.0) [linux-any],
 # libclang-3.7-dev (>= 1:3.7~+rc2) [amd64 i386 armhf],
 # libclc-dev [amd64 i386 armhf],
- mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el !s390x],
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el !s390x],
+ mir-client-platform-mesa-dev,
+ libmirclient-dev,
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.org/
diff --git a/debian/rules b/debian/rules
index 476dd9e..ffc5934 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,11 +77,8 @@ else
 
 # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
EGL_DISPLAYS += wayland
-
-# Mir isn't built on AArch64 and PPC
-ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc ppc64 ppc64el s390x))
+# Likewise, Mir makes no attempt to be portable to random kernels.
EGL_DISPLAYS += mir
-endif
 
 ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += nouveau

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION  |2 
 bin/.cherry-ignore   |7 
 bin/get-extra-pick-list.sh   |   35 
 bin/get-pick-list.sh |2 
 configure.ac |  293 
 debian/changelog |   40 
 debian/control   |6 
 debian/libgbm1.lintian-overrides |1 
 debian/libgl1-mesa-dri.lintian-overrides |3 
 debian/libgl1-mesa-glx.shlibs|1 
 debian/libgl1-mesa-glx.symbols   | 1295 +
 debian/libgles2-mesa.symbols |4 
 debian/libxatracker2.symbols |1 
 debian/patches/egl-platform-mir.patch|  126 
 debian/patches/glapi-Build-glapi_gentable.c-only-on-Darwin.patch |  137 
 debian/patches/i915-dont-default-to-2.1.patch|8 
 debian/patches/series|1 
 debian/rules |   11 
 docs/GL3.txt |   85 
 docs/README.UVD  |4 
 docs/autoconf.html   |9 
 docs/envvars.html|   15 
 docs/index.html  |   79 
 docs/relnotes.html   |   11 
 docs/relnotes/10.6.6.html|  164 
 docs/relnotes/10.6.7.html|   75 
 docs/relnotes/10.6.8.html|  136 
 docs/relnotes/10.6.9.html|  130 
 docs/relnotes/11.0.7.html|  154 
 docs/relnotes/11.0.8.html|  199 
 docs/relnotes/11.1.0.html|  281 
 docs/relnotes/11.1.1.html|  196 
 docs/shading.html|   14 
 docs/specs/EXT_shader_samples_identical.txt  |  176 
 docs/utilities.html  |4 
 docs/vmware-guest.html   |   99 
 include/GL/internal/dri_interface.h  |   11 
 include/c11/threads_posix.h  |   54 
 include/pci_ids/i965_pci_ids.h   |   56 
 src/egl/Makefile.am  |   15 
 src/egl/SConscript   |1 
 src/egl/drivers/dri2/egl_dri2.c  |  289 
 src/egl/drivers/dri2/egl_dri2.h  |   25 
 src/egl/drivers/dri2/platform_android.c  |1 
 src/egl/drivers/dri2/platform_drm.c  |   48 
 src/egl/drivers/dri2/platform_wayland.c  |   12 
 src/egl/drivers/dri2/platform_x11.c  |  138 
 src/egl/drivers/dri2/platform_x11_dri3.c |  547 
 src/egl/drivers/dri2/platform_x11_dri3.h |   41 
 src/egl/egl-symbols-check|   55 
 src/egl/wayland/wayland-drm/wayland-drm.c|2 
 src/egl/wayland/wayland-egl/wayland-egl.c|   29 
 src/gallium/Android.mk   |1 
 src/gallium/Automake.inc |6 
 src/gallium/Makefile.am  |   12 
 src/gallium/SConscript   |1 
 src/gallium/auxiliary/Makefile.am|   14 
 src/gallium/auxiliary/Makefile.sources   |   15 
 src/gallium/auxiliary/draw/draw_llvm.c   |5 
 src/gallium/auxiliary/draw/draw_pipe_aapoint.c   |3 
 src/gallium/auxiliary/draw/draw_pipe_pstipple.c  |3 
 src/gallium/auxiliary/draw/draw_private.h|5 
 src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c|   16 
 src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c   |   16 
 src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h  |3 
 src/gallium/auxiliary/gallivm/lp_bld_format.c|   56 
 src/gallium/auxiliary/gallivm/lp_bld_format.h|   56 
 

mesa: Changes to 'ubuntu-trusty'

[Timo Aaltonen]

 debian/changelog |7 +++
 debian/control   |   12 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 3a6e5c280ac976d0fd37be0f0bbd132c16d29e7e
Author: Timo Aaltonen 
Date:   Tue Jan 12 16:03:08 2016 +0200

release to trusty

diff --git a/debian/changelog b/debian/changelog
index b9ef3bc..cf4de8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.1.3-0ubuntu0.6) UNRELEASED; urgency=medium
+mesa (10.1.3-0ubuntu0.6) trusty; urgency=medium
 
   * control: Allow unrenamed -dev packages to work with lts-wily and lts-
-xenial.
+xenial (LP: #1424466).
 
- -- Timo Aaltonen   Tue, 12 Jan 2016 16:00:10 +0200
+ -- Timo Aaltonen   Tue, 12 Jan 2016 16:02:56 +0200
 
 mesa (10.1.3-0ubuntu0.5) trusty; urgency=medium
 

commit ecf28a360c1a876f8225c1d8182967b790f42711
Author: Timo Aaltonen 
Date:   Tue Jan 12 16:02:53 2016 +0200

control: Allow unrenamed -dev packages to work with lts-wily and lts- 
xenial.

diff --git a/debian/changelog b/debian/changelog
index 1ea554e..b9ef3bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.3-0ubuntu0.6) UNRELEASED; urgency=medium
+
+  * control: Allow unrenamed -dev packages to work with lts-wily and lts-
+xenial.
+
+ -- Timo Aaltonen   Tue, 12 Jan 2016 16:00:10 +0200
+
 mesa (10.1.3-0ubuntu0.5) trusty; urgency=medium
 
   * Build osmesa separately and without using shared glapi again.
diff --git a/debian/control b/debian/control
index cfec2a1..4c3124d 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Package: libxatracker-dev
 Section: libdevel
 Architecture: linux-any
 Depends:
- libxatracker2 (= ${binary:Version}) | libxatracker2-lts-utopic | 
libxatracker2-lts-vivid,
+ libxatracker2 (= ${binary:Version}) | libxatracker2-lts-utopic | 
libxatracker2-lts-vivid | libxatracker2-lts-wily | libxatracker2-lts-xenial,
  ${misc:Depends},
 Description: X acceleration library -- development files
  This package contains the XA (X acceleration) library.  It is used exclusively
@@ -182,9 +182,9 @@ Package: libegl1-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libegl1-mesa (= ${binary:Version}) | libegl1-mesa-lts-utopic | 
libegl1-mesa-lts-vivid,
+ libegl1-mesa (= ${binary:Version}) | libegl1-mesa-lts-utopic | 
libegl1-mesa-lts-vivid | libegl1-mesa-lts-wily |libegl1-mesa-lts-xenial,
 # Vivid and higher only have libegl1-mesa-drivers as a transitional package.
- libegl1-mesa-drivers (= ${binary:Version}) [!hurd-any] | 
libegl1-mesa-drivers-lts-utopic | libwayland-egl1-mesa-lts-vivid,
+ libegl1-mesa-drivers (= ${binary:Version}) [!hurd-any] | 
libegl1-mesa-drivers-lts-utopic | libwayland-egl1-mesa-lts-vivid | 
libwayland-egl1-mesa-lts-wily | libwayland-egl1-mesa-lts-xenial,
  libdrm-dev (>= 2.4.52) [!hurd-any],
  x11proto-dri2-dev (>= 2.6),
  x11proto-gl-dev (>= 1.4.14),
@@ -371,7 +371,7 @@ Package: libgles1-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libgles1-mesa (= ${binary:Version}) | libgles1-mesa-lts-utopic | 
libgles1-mesa-lts-vivid,
+ libgles1-mesa (= ${binary:Version}) | libgles1-mesa-lts-utopic | 
libgles1-mesa-lts-vivid | libgles1-mesa-lts-wily | libgles1-mesa-lts-xenial,
  libegl1-mesa-dev,
  ${misc:Depends},
 Description: free implementation of the OpenGL|ES 1.x API -- development files
@@ -429,7 +429,7 @@ Package: libgles2-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libgles2-mesa (= ${binary:Version}) | libgles2-mesa-lts-utopic | 
libgles2-mesa-lts-vivid,
+ libgles2-mesa (= ${binary:Version}) | libgles2-mesa-lts-utopic | 
libgles2-mesa-lts-vivid | libgles2-mesa-lts-wily | libgles2-mesa-lts-xenial,
  libegl1-mesa-dev,
  ${misc:Depends},
 Description: free implementation of the OpenGL|ES 2.x API -- development files
@@ -607,7 +607,7 @@ Section: libdevel
 Architecture: any
 Depends:
  mesa-common-dev (= ${binary:Version}),
- libgl1-mesa-glx (= ${binary:Version}) | libgl1-mesa-glx-lts-utopic | 
libgl1-mesa-glx-lts-vivid,
+ libgl1-mesa-glx (= ${binary:Version}) | libgl1-mesa-glx-lts-utopic | 
libgl1-mesa-glx-lts-vivid | libgl1-mesa-glx-lts-wily | 
libgl1-mesa-glx-lts-xenial,
  libdrm-dev (>= 2.4.52) [!hurd-any],
  libx11-dev,
  libx11-xcb-dev,

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 bin/.cherry-ignore|3 
 configure.ac  |   19 
 debian/changelog  |   12 
 docs/relnotes/11.0.7.html |3 
 docs/relnotes/11.0.8.html |  199 ++
 src/gallium/auxiliary/nir/tgsi_to_nir.c   |   14 
 src/gallium/auxiliary/tgsi/tgsi_scan.c|3 
 src/gallium/auxiliary/tgsi/tgsi_scan.h|1 
 src/gallium/auxiliary/util/u_helpers.c|8 
 src/gallium/drivers/freedreno/a4xx/a4xx.xml.h |8 
 src/gallium/drivers/freedreno/a4xx/fd4_program.c  |8 
 src/gallium/drivers/freedreno/a4xx/fd4_texture.c  |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp|   15 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |   43 ++
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp   |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp   |2 
 src/gallium/drivers/nouveau/nv50/nv50_state.c |7 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|1 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |6 
 src/gallium/drivers/r600/evergreen_state.c|9 
 src/gallium/drivers/r600/r600_pipe.h  |2 
 src/gallium/drivers/r600/r600_shader.c|  155 +++
 src/gallium/drivers/r600/r600_state_common.c  |   18 
 src/gallium/drivers/r600/r600d.h  |1 
 src/gallium/drivers/radeon/Makefile.am|5 
 src/gallium/drivers/radeon/cayman_msaa.c  |   12 
 src/gallium/drivers/radeon/r600_pipe_common.c |7 
 src/gallium/drivers/radeon/r600d_common.h |2 
 src/gallium/drivers/radeon/radeon_uvd.c   |2 
 src/gallium/drivers/radeon/radeon_uvd.h   |5 
 src/gallium/drivers/radeonsi/si_compute.c |   39 -
 src/gallium/drivers/radeonsi/si_shader.c  |   10 
 src/gallium/drivers/radeonsi/si_shader.h  |4 
 src/gallium/drivers/radeonsi/si_state.c   |   23 +
 src/gallium/drivers/radeonsi/si_state_draw.c  |   22 -
 src/gallium/drivers/radeonsi/si_state_shaders.c   |4 
 src/gallium/targets/opencl/Makefile.am|5 
 src/glsl/ast_to_hir.cpp   |4 
 src/glsl/linker.cpp   |8 
 src/mesa/drivers/common/meta_generate_mipmap.c|   17 
 src/mesa/drivers/dri/i965/brw_context.c   |   18 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |  157 +++
 src/mesa/drivers/dri/i965/brw_fs.h|6 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp  |   41 +-
 src/mesa/drivers/dri/i965/brw_surface_formats.c   |5 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |4 
 src/mesa/main/shader_query.cpp|   11 
 src/mesa/main/varray.c|2 
 53 files changed, 756 insertions(+), 214 deletions(-)

New commits:
commit 82f5f7fe8db13deaefa1f45fe74fa486f8a2b75c
Author: Timo Aaltonen 
Date:   Wed Dec 23 14:54:26 2015 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index 1f8f9ed..ce2a3f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.0.8-1ubuntu1) xenial; urgency=medium
+
+  * Merge from debian.
+
+ -- Timo Aaltonen   Tue, 22 Dec 2015 16:59:55 +0200
+
 mesa (11.0.8-1) unstable; urgency=medium
 
   * New upstream release.

commit d4b7200fe893c252ed53289483f6d4a75e62c3b9
Author: Timo Aaltonen 
Date:   Tue Dec 22 16:18:15 2015 +0200

new release, upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a370c4a..fea180b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.0.8-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 22 Dec 2015 16:12:35 +0200
+
 mesa (11.0.7-1) unstable; urgency=medium
 
   [ Julien Cristau ]

commit 261daab6b4f7a1cff143bebcd632ad5a2cdafa74
Author: Emil Velikov 

mesa: Changes to 'ubuntu+1'

[Christopher Halse Rogers]

 debian/patches/egl-platform-mir.patch |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 14d2fe4742f414145e8c563502f064caa17687e0
Author: Christopher James Halse Rogers 
Date:   Mon Dec 21 14:39:00 2015 +1100

Update Mir patch for dri2_get_dri_config change

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 13f6759..4955db0 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -171,7 +171,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 ===
 --- /dev/null
 +++ mesa/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,633 @@
+@@ -0,0 +1,637 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -497,6 +497,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
 +   struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
 +   struct dri2_egl_surface *dri2_surf;
++   const __DRIconfig *config;
 +   MirSurfaceParameters surf_params;
 +
 +   (void) drv;
@@ -532,6 +533,9 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   if(!mir_advance_colour_buffer(dri2_surf))
 +  goto cleanup_surf;
 +
++   config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
++dri2_surf->base.GLColorspace);
++
 +   if (dri2_dpy->gbm_dri) {
 +  struct gbm_dri_surface *surf = malloc(sizeof *surf);
 +
@@ -545,13 +549,13 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +
 +  dri2_surf->dri_drawable =
 +  (*dri2_dpy->dri2->createNewDrawable) (dri2_dpy->dri_screen,
-+dri2_conf->dri_double_config,
++config,
 +dri2_surf->gbm_surf);
 +   }
 +   else {
 +  dri2_surf->dri_drawable =
 +  (*dri2_dpy->dri2->createNewDrawable) (dri2_dpy->dri_screen,
-+dri2_conf->dri_double_config,
++config,
 +dri2_surf);
 +   }
 +

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 VERSION  |2 
 debian/changelog |   33 
 debian/copyright |  273 --
 debian/libgbm1.lintian-overrides |1 
 debian/libgl1-mesa-dri.lintian-overrides |3 
 debian/libgl1-mesa-glx.shlibs|1 
 debian/libgl1-mesa-glx.symbols   | 1295 
++
 debian/patches/glapi-Build-glapi_gentable.c-only-on-Darwin.patch |  137 +
 debian/patches/series|1 
 docs/envvars.html|6 
 docs/relnotes/11.1.0.html|  191 +
 include/GLES2/gl2ext.h   |  940 +++
 src/gallium/auxiliary/vl/vl_video_buffer.c   |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp   |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp   |   15 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp|6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp|5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp |   40 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp  |2 
 src/gallium/drivers/r600/r600_pipe.h |2 
 src/gallium/drivers/r600/r600_shader.c   |  158 +
 src/gallium/drivers/r600/r600_state.c|   29 
 src/gallium/drivers/r600/r600_state_common.c |   18 
 src/gallium/drivers/r600/r600d.h |1 
 src/gallium/drivers/radeon/r600_pipe_common.c|7 
 src/gallium/drivers/radeon/r600_texture.c|4 
 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c  |2 
 src/gallium/drivers/radeonsi/si_debug.c  |2 
 src/gallium/drivers/radeonsi/si_shader.c |   28 
 src/gallium/drivers/vc4/Makefile.sources |1 
 src/gallium/drivers/vc4/kernel/vc4_packet.h  |   15 
 src/gallium/drivers/vc4/kernel/vc4_render_cl.c   |  276 +-
 src/gallium/drivers/vc4/kernel/vc4_validate.c|   94 
 src/gallium/drivers/vc4/kernel/vc4_validate_shaders.c|   71 
 src/gallium/drivers/vc4/vc4_blit.c   |   65 
 src/gallium/drivers/vc4/vc4_context.c|   25 
 src/gallium/drivers/vc4/vc4_context.h|   11 
 src/gallium/drivers/vc4/vc4_draw.c   |   16 
 src/gallium/drivers/vc4/vc4_drm.h|   11 
 src/gallium/drivers/vc4/vc4_emit.c   |   46 
 src/gallium/drivers/vc4/vc4_job.c|  105 
 src/gallium/drivers/vc4/vc4_nir_lower_blend.c|  133 -
 src/gallium/drivers/vc4/vc4_nir_lower_io.c   |   14 
 src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c   |  172 +
 src/gallium/drivers/vc4/vc4_opt_algebraic.c  |8 
 src/gallium/drivers/vc4/vc4_program.c|  162 +
 src/gallium/drivers/vc4/vc4_qir.c|   13 
 src/gallium/drivers/vc4/vc4_qir.h|   34 
 src/gallium/drivers/vc4/vc4_qpu.h|   11 
 src/gallium/drivers/vc4/vc4_qpu_emit.c   |   15 
 src/gallium/drivers/vc4/vc4_qpu_schedule.c   |4 
 src/gallium/drivers/vc4/vc4_resource.c   |  284 ++
 src/gallium/drivers/vc4/vc4_resource.h   |3 
 src/gallium/drivers/vc4/vc4_screen.c |5 
 src/gallium/drivers/vc4/vc4_simulator_validate.h |2 
 src/gallium/drivers/vc4/vc4_state.c  |   21 
 src/gallium/drivers/vc4/vc4_uniforms.c   |   26 
 src/gallium/state_trackers/clover/core/platform.cpp  |3 
 src/gallium/state_trackers/va/config.c   |   10 
 src/gallium/targets/opencl/Makefile.am   |2 
 src/glsl/ast_function.cpp|6 
 src/glsl/ast_to_hir.cpp  |8 
 src/glsl/glsl_parser.yy  |   20 
 src/glsl/glsl_parser_extras.cpp  |2 
 src/glsl/glsl_parser_extras.h|5 
 

mesa: Changes to 'ubuntu+1'

[Christopher Halse Rogers]

 debian/patches/egl-platform-mir.patch |   94 +++---
 1 file changed, 66 insertions(+), 28 deletions(-)

New commits:
commit df57b8f4e0f246dad236c2f58d9896a7bbd2cceb
Author: Christopher James Halse Rogers 
Date:   Fri Dec 18 17:37:01 2015 +1100

Mir: Implement buffer_age because it's easy, and stop advertising 
swap_buffers_with_damage because it isn't

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 3906473..13f6759 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -133,7 +133,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
 __DRIbuffer   *dri_buffers[__DRI_BUFFER_COUNT];
 struct {
  #ifdef HAVE_WAYLAND_PLATFORM
-@@ -274,9 +282,12 @@ struct dri2_egl_surface
+@@ -274,9 +282,13 @@ struct dri2_egl_surface
void *data;
int data_size;
  #endif
@@ -143,11 +143,12 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
  #endif
 +#ifdef HAVE_MIR_PLATFORM
 +  int fd;
++  int buffer_age;
 +#endif
int locked;
int age;
 } color_buffers[4], *back, *current;
-@@ -289,6 +300,10 @@ struct dri2_egl_surface
+@@ -289,6 +301,10 @@ struct dri2_egl_surface
 /* EGL-owned buffers */
 __DRIbuffer   *local_buffers[__DRI_BUFFER_COUNT];
  #endif
@@ -158,7 +159,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
  };
  
  
-@@ -379,4 +394,7 @@ const __DRIconfig *
+@@ -379,4 +395,7 @@ const __DRIconfig *
  dri2_get_dri_config(struct dri2_egl_config *conf, EGLint surface_type,
  EGLenum colorspace);
  
@@ -170,7 +171,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 ===
 --- /dev/null
 +++ mesa/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,620 @@
+@@ -0,0 +1,633 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -478,6 +479,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   update_cached_buffer_ages(dri2_surf, buf_slot);
 +
 +   dri2_surf->back = _surf->color_buffers[buf_slot];
++   dri2_surf->back->buffer_age = buffer_package.age;
 +   dri2_surf->dri_buffers[__DRI_BUFFER_BACK_LEFT]->name = 0;
 +   dri2_surf->dri_buffers[__DRI_BUFFER_BACK_LEFT]->fd = buffer_package.fd[0];
 +   dri2_surf->dri_buffers[__DRI_BUFFER_BACK_LEFT]->pitch = 
buffer_package.stride;
@@ -691,6 +693,18 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   }
 +}
 +
++static EGLint
++dri2_mir_query_buffer_age(_EGLDriver *drv, _EGLDisplay *dpy,
++   _EGLSurface *surf)
++{
++   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
++   if (dri2_surf->back)
++   {
++  return dri2_surf->back->buffer_age;
++   }
++   return 0;
++}
++
 +static struct dri2_egl_display_vtbl dri2_mir_display_vtbl = {
 +   .authenticate = dri2_mir_authenticate,
 +   .create_window_surface = dri2_create_mir_window_surface,
@@ -704,8 +718,8 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   .swap_buffers_region = dri2_fallback_swap_buffers_region,
 +   .post_sub_buffer = dri2_fallback_post_sub_buffer,
 +   .copy_buffers = dri2_fallback_copy_buffers,
-+   .query_buffer_age = dri2_fallback_query_buffer_age,
-+   .create_wayland_buffer_from_image = NULL,
++   .query_buffer_age = dri2_mir_query_buffer_age,
++   .create_wayland_buffer_from_image = 
dri2_fallback_create_wayland_buffer_from_image,
 +   .get_sync_values = dri2_fallback_get_sync_values,
 +   .get_dri_drawable = dri2_surface_get_dri_drawable,
 +};
@@ -779,7 +793,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   }
 +
 +   disp->Extensions.EXT_buffer_age = EGL_TRUE;
-+   disp->Extensions.EXT_swap_buffers_with_damage = EGL_TRUE;
++   disp->Extensions.EXT_swap_buffers_with_damage = EGL_FALSE;
 +   disp->Extensions.KHR_image_pixmap = EGL_TRUE;
 +
 +   dri2_dpy->vtbl = _mir_display_vtbl;

commit 1fe07ef9fb906a051783b945112b6bda6a1cf9f7
Author: Christopher James Halse Rogers 
Date:   Fri Dec 18 17:26:09 2015 +1100

Update egl-platform-mir patch for vtable changes

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 6b4320f..3906473 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,5 +1,7 @@
 a/configure.ac
-+++ b/configure.ac
+Index: mesa/configure.ac
+===
+--- mesa.orig/configure.ac
 mesa/configure.ac
 @@ -1824,7 +1824,9 @@ for plat in $egl_platforms; do
test "x$have_libdrm" != xyes &&
AC_MSG_ERROR([EGL platform surfaceless requires libdrm 
>= $LIBDRM_REQUIRED])
@@ -19,8 +21,10 @@
  
  AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
  
 a/include/EGL/eglplatform.h
-+++ b/include/EGL/eglplatform.h
+Index: mesa/include/EGL/eglplatform.h

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 bin/get-extra-pick-list.sh|   35 
 bin/get-pick-list.sh  |2 
 debian/changelog  |   18 
 debian/copyright  |  273 +-
 docs/relnotes/11.0.6.html |3 
 docs/relnotes/11.0.7.html |  153 +
 include/GLES2/gl2ext.h|  940 +-
 src/egl/drivers/dri2/platform_wayland.c   |   16 
 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp |9 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp|   46 
 src/gallium/drivers/nouveau/nouveau_buffer.c  |8 
 src/gallium/drivers/nouveau/nv50/nv50_context.c   |   15 
 src/gallium/drivers/nouveau/nvc0/nvc0_context.c   |   17 
 src/gallium/drivers/r600/r600_shader.c|4 
 src/gallium/drivers/r600/r600_state.c |   29 
 src/gallium/drivers/radeon/radeon_vce.c   |5 
 src/gallium/targets/opencl/Makefile.am|2 
 src/glsl/ir.cpp   |3 
 src/glsl/nir/nir_lower_idiv.c |2 
 src/mesa/drivers/common/meta.c|  201 +-
 src/mesa/drivers/common/meta.h|   28 
 src/mesa/drivers/common/meta_blit.c   |   15 
 src/mesa/drivers/common/meta_generate_mipmap.c|   19 
 src/mesa/drivers/common/meta_tex_subimage.c   |   85 
 src/mesa/drivers/dri/common/xmlconfig.c   |3 
 src/mesa/drivers/dri/i965/brw_meta_fast_clear.c   |   40 
 src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c |9 
 src/mesa/main/glformats.c |8 
 src/mesa/main/glformats.h |3 
 src/mesa/main/readpix.c   |2 
 src/mesa/main/texgetimage.c   |   26 
 src/mesa/main/teximage.c  |2 
 src/mesa/main/varray.c|  123 -
 src/mesa/main/varray.h|   20 
 37 files changed, 1751 insertions(+), 423 deletions(-)

New commits:
commit 5fdf7c522eea590d1ecf661a19828f476164d7ca
Author: Timo Aaltonen 
Date:   Thu Dec 10 16:30:03 2015 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index 1405268..390c6e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.0.7-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian.
+- new bugfix release
+
+ -- Timo Aaltonen   Thu, 10 Dec 2015 14:35:28 +0200
+
 mesa (11.0.7-1) unstable; urgency=medium
 
   [ Julien Cristau ]

commit 113bb2c3aaf15f7fde2d150b235e5625548f7a65
Author: Andreas Boll 
Date:   Wed Dec 9 21:18:35 2015 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 1ce198a..a370c4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (11.0.7-1) UNRELEASED; urgency=medium
+mesa (11.0.7-1) unstable; urgency=medium
 
   [ Julien Cristau ]
   * Update debian/copyright from docs/license.html (closes: #806805).  Thanks,
@@ -7,7 +7,7 @@ mesa (11.0.7-1) UNRELEASED; urgency=medium
   [ Andreas Boll ]
   * New upstream release.
 
- -- Julien Cristau   Tue, 01 Dec 2015 20:43:58 +0100
+ -- Andreas Boll   Wed, 09 Dec 2015 21:18:17 +0100
 
 mesa (11.0.6-1) unstable; urgency=medium
 

commit 7ffba4bc28353893f8bc73164414c44ab6882266
Author: Andreas Boll 
Date:   Wed Dec 9 20:17:41 2015 +0100

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 5016544..1ce198a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-mesa (11.0.6-2) UNRELEASED; urgency=medium
+mesa (11.0.7-1) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Update debian/copyright from docs/license.html (closes: #806805).  Thanks,
 Steinar H. Gunderson!
 
+  [ Andreas Boll ]
+  * New upstream release.
+
  -- Julien Cristau   Tue, 01 Dec 2015 20:43:58 +0100
 
 mesa (11.0.6-1) unstable; urgency=medium

commit bec983b738a7f149478ee692ba0e1d26fcc9fd8e
Author: Emil Velikov 
Date:   Wed Dec 9 15:19:30 2015 +

docs: add release notes for 11.0.7

Signed-off-by: Emil Velikov 

diff 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 Makefile.am |1 
 VERSION |2 
 configure.ac|  305 
 debian/changelog|  127 
 debian/control  |   15 
 debian/libgles2-mesa.symbols|4 
 debian/libosmesa6.lintian-overrides |1 
 debian/libwayland-egl1-mesa.lintian-overrides   |1 
 debian/libxatracker2.symbols|1 
 debian/mesa-opencl-icd.lintian-overrides|1 
 debian/patches/docs-Replace-sourceforge-logo-with-a-text-link.patch |   73 
 debian/patches/egl-platform-mir.patch   |   37 
 debian/patches/i915-dont-default-to-2.1.patch   |8 
 debian/patches/i965-remove-early-release-of-dri2-miptree.patch  |   25 
 debian/patches/series   |2 
 debian/rules|2 
 docs/GL3.txt|   85 
 docs/README.UVD |4 
 docs/autoconf.html  |9 
 docs/envvars.html   |9 
 docs/index.html |   79 
 docs/relnotes.html  |   11 
 docs/relnotes/10.6.6.html   |  164 
 docs/relnotes/10.6.7.html   |   75 
 docs/relnotes/10.6.8.html   |  136 
 docs/relnotes/10.6.9.html   |  130 
 docs/relnotes/11.0.0.html   |3 
 docs/relnotes/11.0.1.html   |  134 
 docs/relnotes/11.0.2.html   |   85 
 docs/relnotes/11.0.3.html   |  185 
 docs/relnotes/11.0.4.html   |  168 
 docs/relnotes/11.0.5.html   |  174 
 docs/relnotes/11.0.6.html   |  145 
 docs/relnotes/11.1.0.html   |   95 
 docs/shading.html   |   14 
 docs/specs/EXT_shader_samples_identical.txt |  176 
 docs/utilities.html |4 
 docs/vmware-guest.html  |   99 
 include/GL/internal/dri_interface.h |   11 
 include/c11/threads_posix.h |   54 
 include/pci_ids/i965_pci_ids.h  |   38 
 include/pci_ids/radeonsi_pci_ids.h  |2 
 src/egl/Makefile.am |   15 
 src/egl/SConscript  |1 
 src/egl/drivers/dri2/egl_dri2.c |  298 
 src/egl/drivers/dri2/egl_dri2.h |   25 
 src/egl/drivers/dri2/platform_android.c |1 
 src/egl/drivers/dri2/platform_drm.c |   48 
 src/egl/drivers/dri2/platform_wayland.c |   28 
 src/egl/drivers/dri2/platform_x11.c |  138 
 src/egl/drivers/dri2/platform_x11_dri3.c|  547 
 src/egl/drivers/dri2/platform_x11_dri3.h|   41 
 src/egl/egl-symbols-check   |   55 
 src/egl/main/eglcontext.c   |   49 
 src/egl/wayland/wayland-drm/wayland-drm.c   |2 
 src/egl/wayland/wayland-egl/wayland-egl.c   |   29 
 src/gallium/Android.mk  |1 
 src/gallium/Automake.inc|6 
 src/gallium/Makefile.am |   12 
 src/gallium/SConscript  |1 
 src/gallium/auxiliary/Makefile.am   |   14 
 src/gallium/auxiliary/Makefile.sources  |   15 
 src/gallium/auxiliary/draw/draw_llvm.c  |5 
 src/gallium/auxiliary/draw/draw_pipe_aapoint.c  |3 
 src/gallium/auxiliary/draw/draw_pipe_pstipple.c | 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Makefile.am |1 
 VERSION |2 
 bin/.cherry-ignore  |5 
 debian/changelog|   17 +
 debian/control  |2 
 debian/libosmesa6.lintian-overrides |1 
 debian/libwayland-egl1-mesa.lintian-overrides   |1 
 debian/mesa-opencl-icd.lintian-overrides|1 
 debian/patches/docs-Replace-sourceforge-logo-with-a-text-link.patch |   73 
+
 debian/patches/series   |1 
 docs/relnotes/11.0.5.html   |3 
 docs/relnotes/11.0.6.html   |  144 
++
 src/gallium/drivers/llvmpipe/lp_bld_interp.c|7 
 src/gallium/drivers/nouveau/nouveau_vp3_video.c |1 
 src/gallium/drivers/r600/evergreen_state.c  |4 
 src/gallium/drivers/r600/evergreend.h   |2 
 src/gallium/drivers/radeon/radeon_uvd.c |6 
 src/gallium/drivers/radeon/radeon_video.c   |3 
 src/gallium/drivers/radeonsi/si_state.c |   15 -
 src/gallium/drivers/vc4/vc4_bufmgr.c|5 
 src/gallium/drivers/vc4/vc4_opt_algebraic.c |2 
 src/gallium/drivers/vc4/vc4_program.c   |4 
 src/gallium/drivers/vc4/vc4_qir.c   |8 
 src/gallium/drivers/vc4/vc4_qir.h   |8 
 src/gallium/drivers/vc4/vc4_qpu_emit.c  |4 
 src/gallium/drivers/vc4/vc4_resource.c  |   46 ++-
 src/gallium/drivers/vc4/vc4_state.c |4 
 src/gallium/state_trackers/va/picture.c |2 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c   |   30 +-
 src/glsl/ast_to_hir.cpp |   37 +-
 src/glsl/nir/nir_lower_vars_to_ssa.c|5 
 src/mesa/drivers/common/meta_generate_mipmap.c  |   10 
 src/mesa/drivers/dri/i965/brw_device_info.c |9 
 src/mesa/drivers/dri/r200/r200_tex.h|4 
 src/mesa/drivers/dri/radeon/radeon_tex.h|2 
 src/mesa/main/copyimage.c   |   40 ++
 36 files changed, 452 insertions(+), 57 deletions(-)

New commits:
commit 9a1727e99b9099ea6ae0b73ab8b3ab52c5b34135
Author: Timo Aaltonen 
Date:   Mon Nov 30 16:46:16 2015 +0200

upload to xenial

diff --git a/debian/changelog b/debian/changelog
index a5b9ed0..0fe522c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.0.6-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian.
+- new bugfix release
+
+ -- Timo Aaltonen   Mon, 30 Nov 2015 16:24:08 +0200
+
 mesa (11.0.6-1) unstable; urgency=medium
 
   * New upstream release.

commit 74da11789aa01f4e77d948d299927bf79972fd69
Author: Andreas Boll 
Date:   Fri Nov 27 09:00:03 2015 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 4abc418..2dc43f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (11.0.6-1) UNRELEASED; urgency=medium
+mesa (11.0.6-1) unstable; urgency=medium
 
   * New upstream release.
   * Bump libvdpau-dev build-dep.
@@ -6,7 +6,7 @@ mesa (11.0.6-1) UNRELEASED; urgency=medium
 Lintian error privacy-breach-logo).
   * Add some Lintian overrides for package-name-doesnt-match-sonames.
 
- -- Andreas Boll   Thu, 26 Nov 2015 19:52:36 +0100
+ -- Andreas Boll   Fri, 27 Nov 2015 08:59:30 +0100
 
 mesa (11.0.5-1) unstable; urgency=medium
 

commit 8b03d0f256b14a8ca03d228dd2c38e5ffb2072e7
Author: Andreas Boll 
Date:   Thu Nov 26 20:16:13 2015 +0100

Add some Lintian overrides for package-name-doesnt-match-sonames.

diff --git a/debian/changelog b/debian/changelog
index 8302f91..4abc418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mesa (11.0.6-1) UNRELEASED; urgency=medium
   * Bump libvdpau-dev build-dep.
   * Add docs-Replace-sourceforge-logo-with-a-text-link.patch (Fixes
 Lintian error privacy-breach-logo).
+  * Add some Lintian overrides for package-name-doesnt-match-sonames.
 
  -- Andreas Boll   Thu, 26 Nov 2015 19:52:36 +0100
 
diff --git a/debian/libosmesa6.lintian-overrides 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |6 ++
 debian/control   |4 ++--
 debian/rules |2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 376c5bb0f90003f7fbe3adf935c127d809f795dc
Author: Timo Aaltonen 
Date:   Wed Nov 25 13:33:21 2015 +0200

debian/{rules,control}: Duplicate ppc/arm64 Mir disabling for s390x.

diff --git a/debian/changelog b/debian/changelog
index 0163591..9fb702b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.0.5-1ubuntu2) xenial; urgency=medium
+
+  * debian/{rules,control}: Duplicate ppc/arm64 Mir disabling for s390x.
+
+ -- Adam Conrad   Tue, 24 Nov 2015 00:08:47 -0700
+
 mesa (11.0.5-1ubuntu1) xenial; urgency=medium
 
   * Merge from Debian.
diff --git a/debian/control b/debian/control
index e48e8eb..d654442 100644
--- a/debian/control
+++ b/debian/control
@@ -45,8 +45,8 @@ Build-Depends:
  libwayland-dev (>= 1.2.0) [linux-any],
 # libclang-3.7-dev (>= 1:3.7~+rc2) [amd64 i386 armhf],
 # libclc-dev [amd64 i386 armhf],
- mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el],
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
+ mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el !s390x],
+ libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el !s390x],
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.org/
diff --git a/debian/rules b/debian/rules
index 1d3ac0e..87f82fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ else
EGL_DISPLAYS += wayland
 
 # Mir isn't built on AArch64 and PPC
-ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc ppc64 ppc64el))
+ifeq (,$(filter $(DEB_HOST_ARCH),arm64 powerpc ppc64 ppc64el s390x))
EGL_DISPLAYS += mir
 endif
 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 bin/.cherry-ignore|2 
 debian/changelog  |   14 
 debian/control|1 
 docs/relnotes/11.0.4.html |3 
 docs/relnotes/11.0.5.html |  173 +
 include/pci_ids/i965_pci_ids.h|4 
 include/pci_ids/radeonsi_pci_ids.h|2 
 src/gallium/auxiliary/gallivm/lp_bld_init.c   |3 
 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp |   56 ++
 src/gallium/drivers/nouveau/nv30/nv30_screen.c|2 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_resource.c  |3 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c |   40 +-
 src/gallium/drivers/r600/r600_asm.c   |8 
 src/gallium/drivers/r600/r600_asm.h   |2 
 src/gallium/drivers/r600/r600_shader.c|2 
 src/gallium/drivers/radeon/r600_pipe_common.c |6 
 src/gallium/drivers/radeon/radeon_video.c |   50 --
 src/gallium/drivers/radeon/radeon_winsys.h|1 
 src/gallium/drivers/radeonsi/si_state.c   |1 
 src/gallium/drivers/radeonsi/sid.h|  322 +
 src/gallium/drivers/vc4/vc4_bufmgr.c  |   29 +
 src/gallium/state_trackers/va/buffer.c|6 
 src/gallium/state_trackers/va/image.c |   19 -
 src/gallium/state_trackers/va/picture.c   |4 
 src/gallium/targets/osmesa/osmesa.def |  337 ++
 src/gallium/targets/osmesa/osmesa.mingw.def   |  337 ++
 src/gallium/winsys/amdgpu/drm/amdgpu_id.h |8 
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c |6 
 src/gbm/main/gbm.h|1 
 src/glsl/nir/nir.h|4 
 src/glsl/nir/nir_lower_vec_to_movs.c  |   41 +-
 src/glsl/nir/nir_opt_copy_propagate.c |6 
 src/glsl/nir/nir_opt_remove_phis.c|5 
 src/glsl/nir/nir_split_var_copies.c   |   20 -
 src/mesa/drivers/dri/i965/brw_device_info.c   |6 
 src/mesa/drivers/dri/i965/brw_state.h |2 
 src/mesa/drivers/dri/i965/brw_state_cache.c   |7 
 src/mesa/drivers/dri/i965/intel_fbo.c |6 
 src/mesa/drivers/dri/nouveau/nouveau_context.c|2 
 src/mesa/state_tracker/st_gen_mipmap.c|   68 +--
 43 files changed, 1477 insertions(+), 138 deletions(-)

New commits:
commit df76d88f96f7daecd5f054f0684d3bb68dcdac42
Author: Timo Aaltonen 
Date:   Thu Nov 12 16:50:02 2015 +0200

update changelog, release to xenial

diff --git a/debian/changelog b/debian/changelog
index 93f3233..0163591 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.0.5-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian.
+- new upstream bugfix release
+
+ -- Timo Aaltonen   Thu, 12 Nov 2015 16:49:01 +0200
+
 mesa (11.0.5-1) unstable; urgency=medium
 
   * New upstream release.

commit 459e84b094b2f8a23f22e4690b459f8837ccd7cc
Author: Andreas Boll 
Date:   Thu Nov 12 11:55:31 2015 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index a9317b6..13ba1e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (11.0.5-1) UNRELEASED; urgency=medium
+mesa (11.0.5-1) unstable; urgency=medium
 
   * New upstream release.
   * Add myself to Uploaders.
 
- -- Andreas Boll   Thu, 12 Nov 2015 09:36:33 +0100
+ -- Andreas Boll   Thu, 12 Nov 2015 11:55:02 +0100
 
 mesa (11.0.4-1) unstable; urgency=medium
 

commit a073ccf34019f0cbcb1fea71f34c3d7544049188
Author: Andreas Boll 
Date:   Thu Nov 12 11:50:47 2015 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index ec795ea..a9317b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (11.0.5-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Add myself to Uploaders.
 
  -- Andreas Boll   Thu, 12 Nov 2015 09:36:33 +0100
 
diff --git a/debian/control b/debian/control
index b244433..800f99b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: mesa
 Section: graphics
 Priority: optional
 Maintainer: Debian X Strike Force 
+Uploaders: Andreas Boll 
 Standards-Version: 3.9.6
 Build-Depends:
  debhelper (>= 9),

commit 3915bc0845da3e82c3cf9c0527dbb75bda6841d9

mesa: Changes to 'ubuntu-vivid-lts'

[Timo Aaltonen]

 debian/changelog |6 
 debian/control   |   76 ---
 debian/not-installed |2 -
 debian/rules |2 -
 4 files changed, 50 insertions(+), 36 deletions(-)

New commits:
commit c47dfb4a975ad67d5178162413d7cc3e685b0a1b
Author: Timo Aaltonen 
Date:   Wed Sep 9 06:31:01 2015 +0300

release to trusty

diff --git a/debian/changelog b/debian/changelog
index 801d01a..aedfcb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa-lts-vivid (10.5.9-2ubuntu1~trusty3) UNRELEASED; urgency=medium
+mesa-lts-vivid (10.5.9-2ubuntu1~trusty3) trusty; urgency=medium
 
   * control: Add renamed libosmesa6/-dev. (LP: #1424059)
 
- -- Timo Aaltonen   Tue, 08 Sep 2015 14:33:08 +0300
+ -- Timo Aaltonen   Wed, 09 Sep 2015 06:28:54 +0300
 
 mesa-lts-vivid (10.5.9-2ubuntu1~trusty2) trusty; urgency=medium
 

commit 37779260883f916d07581ccc1b9291968f7b91cc
Author: Timo Aaltonen 
Date:   Tue Sep 8 14:36:22 2015 +0300

control: Add renamed libosmesa6/-dev. (LP: #1424059)

diff --git a/debian/changelog b/debian/changelog
index 0433b99..801d01a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa-lts-vivid (10.5.9-2ubuntu1~trusty3) UNRELEASED; urgency=medium
+
+  * control: Add renamed libosmesa6/-dev. (LP: #1424059)
+
+ -- Timo Aaltonen   Tue, 08 Sep 2015 14:33:08 +0300
+
 mesa-lts-vivid (10.5.9-2ubuntu1~trusty2) trusty; urgency=medium
 
   * Backport vivid package for lts-vivid stack.
diff --git a/debian/control b/debian/control
index 9c0f064..5622c6a 100644
--- a/debian/control
+++ b/debian/control
@@ -649,40 +649,48 @@ Description: Developer documentation for Mesa
 Provides: mesa-common-dev, xorg-renamed-package, xorg-renamed-package-lts-vivid
 Conflicts: mesa-common-dev, xorg-renamed-package-lts-utopic,
 
-#Package: libosmesa6
-#Section: libs
-#Architecture: any
-#Depends:
-# ${shlibs:Depends},
-# ${misc:Depends},
-# libglapi-mesa (= ${binary:Version}),
-#Replaces: libgl1-mesa-swx11 (<< 6.5.2)
-#Pre-Depends: ${misc:Pre-Depends}
-#Multi-Arch: same
-#Description: Mesa Off-screen rendering extension
-# OSmesa is a Mesa extension that allows programs to render to an
-# off-screen buffer using the OpenGL API without having to create a
-# rendering context on an X Server.  It uses a pure software renderer.
-# .
-# This package provides both 16-bit and 32-bit versions of the off-screen
-# renderer which do not require external libraries to work.
-
-#Package: libosmesa6-dev
-#Section: libdevel
-#Architecture: any
-#Depends:
-# libosmesa6 (= ${binary:Version}),
-# mesa-common-dev (= ${binary:Version}) | libgl-dev,
-# ${misc:Depends},
-#Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
-#Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), 
mesa-common-dev (<< 6.5.2)
-#Provides: xlibosmesa-dev, libosmesa-dev
-#Multi-Arch: same
-#Description: Mesa Off-screen rendering extension -- development files
-# This package provides the required environment for developing programs
-# that use the off-screen rendering extension of Mesa.
-# .
-# For more information on OSmesa see the libosmesa6 package.
+Package: libosmesa6-lts-vivid
+Section: libs
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libglapi-mesa-lts-vivid (= ${binary:Version}),
+Replaces: libgl1-mesa-swx11 (<< 6.5.2),
+ libosmesa6
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Mesa Off-screen rendering extension
+ OSmesa is a Mesa extension that allows programs to render to an
+ off-screen buffer using the OpenGL API without having to create a
+ rendering context on an X Server.  It uses a pure software renderer.
+ .
+ This package provides both 16-bit and 32-bit versions of the off-screen
+ renderer which do not require external libraries to work.
+Conflicts:
+ libosmesa6, xorg-renamed-package-lts-utopic
+Provides:
+ libosmesa6, xorg-renamed-package, xorg-renamed-package-lts-vivid
+
+Package: libosmesa6-dev-lts-vivid
+Section: libdevel
+Architecture: any
+Depends:
+ libosmesa6-lts-vivid (= ${binary:Version}),
+ mesa-common-dev-lts-vivid (= ${binary:Version}) | libgl-dev,
+ ${misc:Depends},
+Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev,
+ libosmesa6-dev, xorg-renamed-package-lts-utopic
+Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), 
mesa-common-dev (<< 6.5.2),
+ libosmesa6-dev
+Provides: xlibosmesa-dev, libosmesa-dev,
+ libosmesa6-dev, xorg-renamed-package, xorg-renamed-package-lts-vivid
+Multi-Arch: same
+Description: Mesa Off-screen rendering extension -- development files
+ This package provides the required environment for developing programs
+ that use the off-screen rendering extension of Mesa.
+ .
+ For more information on OSmesa see the libosmesa6 package.
 
 Package: mesa-vdpau-drivers-lts-vivid
 Section: libs
diff --git a/debian/not-installed 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 772ea5f82925bf36d0b09368b6a81675ec55521e
Author: Timo Aaltonen 
Date:   Wed Oct 28 08:11:57 2015 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index cc166ad..60dff88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (11.0.4-1ubuntu1) UNRELEASED; urgency=medium
+mesa (11.0.4-1ubuntu1) xenial; urgency=medium
 
   [ Timo Aaltonen ]
   * Merge from Debian.
@@ -8,7 +8,7 @@ mesa (11.0.4-1ubuntu1) UNRELEASED; urgency=medium
   [ Christopher James Halse Rogers ]
   * patches: Fix Mir patch harder.
 
- -- Christopher James Halse Rogers   Wed, 28 Oct 2015 
11:10:12 +1100
+ -- Timo Aaltonen   Wed, 28 Oct 2015 07:58:56 +0200
 
 mesa (11.0.4-1) unstable; urgency=medium
 

mesa: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog  |6 +-
 debian/patches/egl-platform-mir.patch |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit e6c789a7d625d7fb1a6f96ef2e8b3073db6e05f6
Author: Christopher James Halse Rogers 
Date:   Wed Oct 28 11:10:34 2015 +1100

Update changelog

diff --git a/debian/changelog b/debian/changelog
index b2e08f1..cc166ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 mesa (11.0.4-1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * Merge from Debian.
   * patches: Dropped patches included in this release, fix Mir patch
 FTBFS. (LP: #1509005)
 
- -- Timo Aaltonen   Mon, 26 Oct 2015 14:06:15 +0200
+  [ Christopher James Halse Rogers ]
+  * patches: Fix Mir patch harder.
+
+ -- Christopher James Halse Rogers   Wed, 28 Oct 2015 
11:10:12 +1100
 
 mesa (11.0.4-1) unstable; urgency=medium
 

commit 35c0047030ce23a1bbcbf2f663c75854b684ad97
Author: Christopher James Halse Rogers 
Date:   Wed Oct 28 11:09:30 2015 +1100

Update Mir EGL platform so that it really, really builds.

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 92bb428..e1bad46 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -170,7 +170,7 @@ Index: mesa-11.0.2/src/egl/drivers/dri2/platform_mir.c
 ===
 --- /dev/null
 +++ mesa-11.0.2/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,617 @@
+@@ -0,0 +1,618 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -200,6 +200,7 @@ Index: mesa-11.0.2/src/egl/drivers/dri2/platform_mir.c
 + */
 +
 +#include 
++#include 
 +
 +#include 
 +#include 

mesa: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog  |   14 ++
 debian/patches/core-fix-EXT_texture_format_BGRA.patch |   71 +
 debian/patches/egl-platform-mir.patch |   72 +-
 debian/patches/series |1 
 4 files changed, 133 insertions(+), 25 deletions(-)

New commits:
commit 6c5e9baf8026ea4bc67cda2e0f6d20011fa9a191
Author: Christopher James Halse Rogers 
Date:   Fri Oct 9 14:53:40 2015 +1100

Fold in -1ubuntu3 upload from the archive

diff --git a/debian/changelog b/debian/changelog
index 62904a5..deffbf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (11.0.2-1ubuntu3) wily; urgency=medium
+mesa (11.0.2-1ubuntu4) wily; urgency=medium
 
   * core-fix-EXT_texture_format_BGRA.patch: Cherry pick upstream commit
 fixing incorrectly-strict error handling in format code. Fixes black
@@ -6,6 +6,12 @@ mesa (11.0.2-1ubuntu3) wily; urgency=medium
 
  -- Christopher James Halse Rogers   Fri, 09 Oct 2015 
14:45:54 +1100
 
+mesa (11.0.2-1ubuntu3) wily; urgency=medium
+
+  * d/patches/egl-platform-mir.patch: add mirclient dependency (LP: #1503450)
+
+ -- Tiago Stürmer Daitx   Tue, 06 Oct 2015 22:05:12 
+
+
 mesa (11.0.2-1ubuntu2) wily; urgency=medium
 
   * control, rules: Disable LLVM on ppc64el again, until unity tests
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 0333455..1222c9f 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,17 +1,19 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -1772,7 +1772,9 @@ for plat in $egl_platforms; do
+Index: mesa-11.0.2/configure.ac
+===
+--- mesa-11.0.2.orig/configure.ac
 mesa-11.0.2/configure.ac
+@@ -1647,7 +1647,9 @@ for plat in $egl_platforms; do
test "x$have_libdrm" != xyes &&
AC_MSG_ERROR([EGL platform surfaceless requires libdrm 
>= $LIBDRM_REQUIRED])
;;
 -
 +mir)
-+PKG_CHECK_MODULES([MIR], [mir-client-platform-mesa-dev])
++PKG_CHECK_MODULES([MIR], [mirclient 
mir-client-platform-mesa-dev])
 +;;
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
;;
-@@ -1798,6 +1800,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND
+@@ -1673,6 +1675,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_SURFACELESS, echo "$egl_platforms" | grep -q 
'surfaceless')
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null')
@@ -19,8 +21,10 @@
  
  AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
  
 a/include/EGL/eglplatform.h
-+++ b/include/EGL/eglplatform.h
+Index: mesa-11.0.2/include/EGL/eglplatform.h
+===
+--- mesa-11.0.2.orig/include/EGL/eglplatform.h
 mesa-11.0.2/include/EGL/eglplatform.h
 @@ -105,6 +105,13 @@ typedef struct ANativeWindow*
  typedef struct egl_native_pixmap_t* EGLNativePixmapType;
  typedef void*   EGLNativeDisplayType;
@@ -35,8 +39,10 @@
  #elif defined(__unix__) || defined(__APPLE__)
  
  #if defined(MESA_EGL_NO_X11_HEADERS)
 a/include/GL/internal/dri_interface.h
-+++ b/include/GL/internal/dri_interface.h
+Index: mesa-11.0.2/include/GL/internal/dri_interface.h
+===
+--- mesa-11.0.2.orig/include/GL/internal/dri_interface.h
 mesa-11.0.2/include/GL/internal/dri_interface.h
 @@ -886,10 +886,12 @@ struct __DRIbufferRec {
  unsigned int pitch;
  unsigned int cpp;
@@ -51,8 +57,10 @@
  struct __DRIdri2LoaderExtensionRec {
  __DRIextension base;
  
 a/src/egl/drivers/dri2/egl_dri2.c
-+++ b/src/egl/drivers/dri2/egl_dri2.c
+Index: mesa-11.0.2/src/egl/drivers/dri2/egl_dri2.c
+===
+--- mesa-11.0.2.orig/src/egl/drivers/dri2/egl_dri2.c
 mesa-11.0.2/src/egl/drivers/dri2/egl_dri2.c
 @@ -757,6 +757,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
   return EGL_TRUE;
return dri2_initialize_wayland(drv, disp);
@@ -90,8 +98,10 @@
for (i = 0; dri2_dpy->driver_configs[i]; i++)
   free((__DRIconfig *) dri2_dpy->driver_configs[i]);
free(dri2_dpy->driver_configs);
 a/src/egl/drivers/dri2/egl_dri2.h
-+++ b/src/egl/drivers/dri2/egl_dri2.h
+Index: mesa-11.0.2/src/egl/drivers/dri2/egl_dri2.h
+===
+--- mesa-11.0.2.orig/src/egl/drivers/dri2/egl_dri2.h
 mesa-11.0.2/src/egl/drivers/dri2/egl_dri2.h
 @@ -66,6 +66,10 @@
  
  #endif /* HAVE_ANDROID_PLATFORM */
@@ -156,8 +166,10 @@
 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |7 +++
 debian/control   |4 ++--
 debian/rules |2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 3542723ae751512163eb705170aca9b33e32c972
Author: Timo Aaltonen 
Date:   Fri Oct 2 17:34:33 2015 +0300

control, rules: Disable LLVM on ppc64el again, until unity tests pass with 
it.

diff --git a/debian/changelog b/debian/changelog
index b537f45..fb0b97c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.0.2-1ubuntu2) wily; urgency=medium
+
+  * control, rules: Disable LLVM on ppc64el again, until unity tests
+pass with it.
+
+ -- Timo Aaltonen   Fri, 02 Oct 2015 15:45:56 +0300
+
 mesa (11.0.2-1ubuntu1) wily; urgency=medium
 
   * Merge from debian.
diff --git a/debian/control b/debian/control
index 2e0d0e9..7a7f84d 100644
--- a/debian/control
+++ b/debian/control
@@ -39,8 +39,8 @@ Build-Depends:
  libudev-dev [linux-any],
  flex,
  bison,
- llvm-3.6-dev (>= 1:3.6) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf 
ppc64el],
- libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf ppc64el],
+ llvm-3.6-dev (>= 1:3.6) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
 # libclang-3.7-dev (>= 1:3.7~+rc2) [amd64 i386 armhf],
 # libclc-dev [amd64 i386 armhf],
diff --git a/debian/rules b/debian/rules
index 4cd62d4..1d3ac0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,7 +96,7 @@ else
   endif
 
   # LLVM is required for r300g, radeonsi and llvmpipe:
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
armhf ppc64el))
+  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
armhf))
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.6

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 configure.ac  |   10 
 debian/changelog  |   18 
 debian/control|4 
 debian/rules  |2 
 docs/relnotes/11.0.0.html |3 
 docs/relnotes/11.0.1.html |  134 ++
 docs/relnotes/11.0.2.html |   84 +
 src/gallium/drivers/freedreno/a3xx/fd3_format.c   |2 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|2 
 src/gallium/drivers/nouveau/nv50/nv50_tex.c   |   21 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c   |   19 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_tex.c   |   22 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c   |   20 
 src/gallium/drivers/radeonsi/si_shader.c  |2 
 src/gbm/backends/dri/gbm_dri.c|   18 
 src/glsl/builtin_variables.cpp|   12 
 src/glsl/nir/nir.c|   20 
 src/glsl/nir/nir.h|   13 
 src/glsl/nir/nir_from_ssa.c   |2 
 src/glsl/nir/nir_lower_alu_to_scalar.c|6 
 src/glsl/nir/nir_lower_atomics.c  |2 
 src/glsl/nir/nir_lower_io.c   |2 
 src/glsl/nir/nir_lower_locals_to_regs.c   |7 
 src/glsl/nir/nir_lower_vec_to_movs.c  |4 
 src/glsl/nir/nir_opt_peephole_ffma.c  |3 
 src/glsl/nir/nir_opt_peephole_select.c|4 
 src/mesa/drivers/common/meta_tex_subimage.c   |   43 
 src/mesa/drivers/dri/i915/intel_render.c  |2 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |5 
 src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp |  201 +++-
 src/mesa/drivers/dri/i965/brw_vec4.cpp|   29 
 src/mesa/drivers/dri/i965/brw_vec4_nir.cpp|4 
 src/mesa/drivers/dri/radeon/radeon_swtcl.c|2 
 src/mesa/main/fbobject.c  |   11 
 src/mesa/main/glformats.c |  663 +-
 src/mesa/main/glformats.h |2 
 src/mesa/main/readpix.c   |1 
 src/mesa/main/texcompress_bptc.c  |3 
 src/mesa/main/texcompress_fxt1.c  |3 
 src/mesa/main/texcompress_rgtc.c  |6 
 src/mesa/main/texcompress_s3tc.c  |9 
 src/mesa/main/teximage.c  |  548 ---
 src/mesa/main/teximage.h  |4 
 src/mesa/state_tracker/st_atom_texture.c  |4 
 src/mesa/tnl_dd/t_dd_dmatmp.h |  155 +--
 47 files changed, 1425 insertions(+), 710 deletions(-)

New commits:
commit cd59ba3ade0e24c3b378402e56779db88aa8bf0e
Author: Timo Aaltonen 
Date:   Wed Sep 30 15:41:05 2015 +0300

release to wily

diff --git a/debian/changelog b/debian/changelog
index bd00672..b537f45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.0.2-1ubuntu1) wily; urgency=medium
+
+  * Merge from debian.
+- new upstream bugfix release
+
+ -- Timo Aaltonen   Wed, 30 Sep 2015 15:19:09 +0300
+
 mesa (11.0.2-1) experimental; urgency=medium
 
   [ Andreas Boll ]

commit 29ec09297641c4acd2d5a0dddcc4a71322a1944c
Author: Timo Aaltonen 
Date:   Tue Sep 29 16:36:21 2015 +0300

upload tto experimental

diff --git a/debian/changelog b/debian/changelog
index b331074..54174db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (11.0.2-1) UNRELEASED; urgency=medium
+mesa (11.0.2-1) experimental; urgency=medium
 
   [ Andreas Boll ]
   * control: Bump libclc dependencies.
@@ -7,7 +7,7 @@ mesa (11.0.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * rules, control: Enable llvmpipe on ppc64el. (LP: #1489483)
 
- -- Andreas Boll   Mon, 14 Sep 2015 17:30:51 +0200
+ -- Timo Aaltonen   Tue, 29 Sep 2015 16:35:59 +0300
 
 mesa (11.0.0-1) experimental; urgency=medium
 

commit d3f5f22b92ff4d16614ad302154f2a229ab8d7bd
Author: Timo Aaltonen 
Date:   Tue Sep 29 16:25:16 2015 +0300

rules, control: Enable llvmpipe on ppc64el. (LP: #1489483)

diff --git a/debian/changelog b/debian/changelog
index 5b124ec..b331074 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mesa (11.0.2-1) UNRELEASED; urgency=medium
 
   

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Android.common.mk  |   10 
 Android.mk |   15 
 CleanSpec.mk   |1 
 Makefile.am|4 
 VERSION|2 
 bin/bugzilla_mesa.sh   |   13 
 configure.ac   |  150 
 debian/changelog   |   86 
 debian/control |   36 
 debian/libegl1-mesa.symbols|   10 
 debian/libgl1-mesa-glx-i686.install.in |1 
 debian/libgles2-mesa.symbols   |   17 
 debian/not-installed   |2 
 debian/patches/egl-platform-mir.patch  |  112 
 debian/patches/i965-remove-early-release-of-dri2-miptree.patch |   25 
 debian/patches/series  |1 
 debian/rules   |   13 
 docs/GL3.txt   |   87 
 docs/devinfo.html  |  400 
 docs/egl.html  |6 
 docs/index.html|   65 
 docs/relnotes.html |   10 
 docs/relnotes/10.5.6.html  |  147 
 docs/relnotes/10.5.7.html  |  103 
 docs/relnotes/10.5.8.html  |  112 
 docs/relnotes/10.5.9.html  |  140 
 docs/relnotes/10.6.3.html  |3 
 docs/relnotes/10.6.4.html  |  137 
 docs/relnotes/10.6.5.html  |  124 
 docs/relnotes/11.0.0.html  |  258 
 doxygen/.gitignore |1 
 doxygen/Makefile   |1 
 include/EGL/egl.h  |  562 -
 include/EGL/eglext.h   |  258 
 include/EGL/eglmesaext.h   |   33 
 include/EGL/eglplatform.h  |   19 
 include/GL/glext.h |  299 
 include/GL/glx.h   |   92 
 include/GL/internal/dri_interface.h|   31 
 include/KHR/khrplatform.h  |   19 
 include/c99_math.h |   12 
 include/pci_ids/i965_pci_ids.h |3 
 include/pci_ids/radeonsi_pci_ids.h |   25 
 scons/gallium.py   |1 
 scons/llvm.py  |4 
 src/Makefile.am|   10 
 src/SConscript |7 
 src/egl/Android.mk |   97 
 src/egl/Makefile.am|  119 
 src/egl/Makefile.sources   |   34 
 src/egl/SConscript |   33 
 src/egl/drivers/dri2/Android.mk|   64 
 src/egl/drivers/dri2/Makefile.am   |   68 
 src/egl/drivers/dri2/SConscript|   40 
 src/egl/drivers/dri2/egl_dri2.c|  353 
 src/egl/drivers/dri2/egl_dri2.h|   16 
 src/egl/drivers/dri2/platform_android.c|   11 
 src/egl/drivers/dri2/platform_drm.c|   36 
 src/egl/drivers/dri2/platform_surfaceless.c|  162 
 src/egl/drivers/dri2/platform_wayland.c|   93 
 src/egl/drivers/dri2/platform_x11.c|  157 
 src/egl/drivers/haiku/SConscript   |   34 
 src/egl/drivers/haiku/egl_haiku.cpp  

mesa: Changes to 'ubuntu-trusty'

[Timo Aaltonen]

 debian/changelog |7 +++
 debian/control   |1 -
 debian/libosmesa6-dev.install.in |6 +++---
 debian/libosmesa6.install.in |2 +-
 debian/not-installed |   14 ++
 debian/rules |   12 ++--
 6 files changed, 35 insertions(+), 7 deletions(-)

New commits:
commit d2438c3747d7131d4a865d1baf2a9fa310ba2817
Author: Timo Aaltonen 
Date:   Thu Sep 17 11:35:41 2015 +0300

release to trusty

diff --git a/debian/changelog b/debian/changelog
index efba74d..1ea554e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.1.3-0ubuntu0.5) UNRELEASED; urgency=medium
+mesa (10.1.3-0ubuntu0.5) trusty; urgency=medium
 
   * Build osmesa separately and without using shared glapi again.
 (LP: #1424059)
 
- -- Timo Aaltonen   Thu, 17 Sep 2015 08:59:44 +0300
+ -- Timo Aaltonen   Thu, 17 Sep 2015 11:35:21 +0300
 
 mesa (10.1.3-0ubuntu0.4) trusty; urgency=medium
 

commit a140a14ef74e9505e3713ca429e4fc08d6e39a01
Author: Timo Aaltonen 
Date:   Thu Sep 17 10:59:00 2015 +0300

Build osmesa separately and without using shared glapi again. (LP: #1424059)

diff --git a/debian/changelog b/debian/changelog
index b36bf14..efba74d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.3-0ubuntu0.5) UNRELEASED; urgency=medium
+
+  * Build osmesa separately and without using shared glapi again.
+(LP: #1424059)
+
+ -- Timo Aaltonen   Thu, 17 Sep 2015 08:59:44 +0300
+
 mesa (10.1.3-0ubuntu0.4) trusty; urgency=medium
 
   * Allow unrenamed -dev packages to work with the renamed stack. (LP: 
#1424466)
diff --git a/debian/control b/debian/control
index d18bfcc..cfec2a1 100644
--- a/debian/control
+++ b/debian/control
@@ -657,7 +657,6 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- libglapi-mesa (= ${binary:Version}),
 Replaces: libgl1-mesa-swx11 (<< 6.5.2)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
diff --git a/debian/libosmesa6-dev.install.in b/debian/libosmesa6-dev.install.in
index 9796d26..9ce06c1 100644
--- a/debian/libosmesa6-dev.install.in
+++ b/debian/libosmesa6-dev.install.in
@@ -1,3 +1,3 @@
-dri/usr/include/GL/osmesa.husr/include/GL
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc  
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/include/GL/osmesa.husr/include/GL
+usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc
diff --git a/debian/libosmesa6.install.in b/debian/libosmesa6.install.in
index e34327e..1ada4d5 100644
--- a/debian/libosmesa6.install.in
+++ b/debian/libosmesa6.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*   
usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*
diff --git a/debian/not-installed b/debian/not-installed
index d3048a4..ffc3524 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -2,5 +2,19 @@
 
 # Common list:
 NOT_INSTALLED := \
+   etc/drirc \
+   usr/lib/*/libGL.so* \
+   usr/lib/*/pkgconfig/dri.pc \
+   usr/lib/*/pkgconfig/gl.pc \
+   usr/include/GL/glext.h \
+   usr/include/GL/gl.h \
+   usr/include/GL/gl_mangle.h \
+   usr/include/GL/glxext.h \
+   usr/include/GL/glx.h \
+   usr/include/GL/glx_mangle.h \
+   usr/include/GL/wglext.h \
+   usr/include/GL/wmesa.h \
+   usr/include/GL/internal/dri_interface.h \
+   dri/usr/include/GL/osmesa.h \
dri/usr/include/GL/wglext.h \
dri/usr/include/GL/wmesa.h
diff --git a/debian/rules b/debian/rules
index 43329b0..6158520 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ buildflags-i686 = \
 include debian/not-installed
 
 # build the following configurations by default
-CONFIGS = dri
+CONFIGS = dri osmesa
 
 STAMP_DIR = debian/stamp
 STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
@@ -118,7 +118,7 @@ confflags-dri = \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \

--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\{ORIGIN}/dri:/usr/lib/dri'
 \
-   --enable-osmesa \
+   --disable-osmesa \
--enable-glx-tls \
--enable-shared-glapi \
--enable-texture-float \
@@ -132,6 +132,14 @@ confflags-dri = \
$(confflags_OPENVG) \
$(buildflags)
 
+confflags-osmesa = \
+   --disable-egl \
+   --disable-shared-glapi \
+   --enable-osmesa \
+   --with-dri-drivers= \
+   --with-gallium-drivers= \
+   $(buildflags)
+
 configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 Android.common.mk  |3 
 VERSION|2 
 debian/changelog   |   31 +
 debian/control |3 
 debian/patches/i965-remove-early-release-of-dri2-miptree.patch |   25 +
 debian/patches/series  |1 
 debian/rules   |2 
 docs/relnotes/11.0.0.html  |  168 
+-
 src/gallium/auxiliary/Makefile.am  |   29 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp  |   11 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp  |5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp   |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp |   90 -
 src/gallium/drivers/nouveau/nouveau_buffer.c   |4 
 src/gallium/drivers/nouveau/nouveau_buffer.h   |2 
 src/gallium/drivers/nouveau/nouveau_context.h  |5 
 src/gallium/drivers/nouveau/nv30/nv30_miptree.c|   38 ++
 src/gallium/drivers/nouveau/nv30/nv30_screen.c |   20 +
 src/gallium/drivers/nouveau/nv30/nv30_screen.h |2 
 src/gallium/drivers/nouveau/nv30/nv30_transfer.c   |4 
 src/gallium/drivers/nouveau/nv50/nv50_formats.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_context.h|8 
 src/gallium/drivers/nouveau/nvc0/nvc0_program.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c  |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c |3 
 src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c   |   46 ++
 src/gallium/drivers/r600/evergreen_state.c |4 
 src/gallium/drivers/r600/r600_shader.c |   19 -
 src/gallium/drivers/r600/r600_state.c  |8 
 src/gallium/drivers/radeonsi/si_pipe.c |4 
 src/gallium/state_trackers/clover/llvm/invocation.cpp  |2 
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c  |   15 
 src/glsl/Android.gen.mk|   22 -
 src/glsl/Makefile.am   |   53 +--
 src/glsl/Makefile.sources  |3 
 src/glsl/opt_constant_propagation.cpp  |   46 +-
 src/glsl/opt_constant_variable.cpp |   39 +-
 src/mapi/Makefile.am   |   23 -
 src/mapi/glapi/gen/Makefile.am |   38 +-
 src/mesa/Makefile.am   |   45 +-
 src/mesa/drivers/common/meta_generate_mipmap.c |9 
 src/mesa/drivers/dri/common/xmlpool/Makefile.am|2 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp   |4 
 src/mesa/drivers/dri/i965/brw_context.c|9 
 src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp  |   44 +-
 src/mesa/drivers/dri/i965/intel_tex_copy.c |4 
 src/mesa/state_tracker/st_extensions.c |9 
 src/mesa/state_tracker/st_format.c |   22 -
 src/util/Makefile.am   |6 
 50 files changed, 688 insertions(+), 256 deletions(-)

New commits:
commit 3cb229c0d3473caaacdcc6fd01b737e6b60eafb1
Author: Timo Aaltonen 
Date:   Tue Sep 15 07:50:25 2015 +0300

close FFE bug

diff --git a/debian/changelog b/debian/changelog
index 7b8188d..8213e94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 mesa (11.0.0-1ubuntu1) UNRELEASED; urgency=medium
 
-  * Merge from Debian.
+  * Merge from Debian. (LP: #1484279)
   * egl-platform-mir.patch: Updated.
   * i965-remove-early-release-of-dri2-miptree.patch: Add a workaround to
 fix crashes in brw_meta_fast_clear. (LP: #1492037)

commit 6a5f73181528b78b9a86e98b9d562fa358eca996
Author: Timo Aaltonen 
Date:   Tue Sep 15 07:28:20 2015 +0300

control, rules: Default to llvm-3.6 again, because 3.7 won't be in main for 
wily.

diff --git a/debian/changelog b/debian/changelog
index 66b0f53..7b8188d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (11.0.0-1ubuntu1) UNRELEASED; urgency=medium
   * egl-platform-mir.patch: Updated.
   * i965-remove-early-release-of-dri2-miptree.patch: Add a workaround to
 fix crashes in brw_meta_fast_clear. (LP: #1492037)
+  * control, rules: Default to llvm-3.6 again, because 3.7 won't be in
+main for wily.
 
  -- Timo Aaltonen 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 VERSION|2 
 debian/changelog   |   14 +-
 debian/control |4 
 src/egl/SConscript |1 
 src/gallium/auxiliary/gallivm/lp_bld_const.c   |2 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr.h   |5 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c |   42 +-
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h  |2 
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h  |2 
 src/gallium/drivers/freedreno/a4xx/a4xx.xml.h  |5 
 src/gallium/drivers/freedreno/a4xx/fd4_format.c|   10 -
 src/gallium/drivers/freedreno/adreno_common.xml.h  |2 
 src/gallium/drivers/freedreno/adreno_pm4.xml.h |2 
 src/gallium/drivers/nouveau/nouveau_buffer.c   |   12 +
 src/gallium/drivers/nouveau/nv30/nv30_miptree.c|   29 ++--
 src/gallium/drivers/nouveau/nv30/nv30_resource.h   |3 
 src/gallium/drivers/nouveau/nv50/nv50_context.c|6 
 src/gallium/drivers/nouveau/nv50/nv50_context.h|2 
 src/gallium/drivers/nouveau/nv50/nv50_program.c|1 
 src/gallium/drivers/nouveau/nv50/nv50_program.h|1 
 src/gallium/drivers/nouveau/nv50/nv50_query.c  |   15 +-
 src/gallium/drivers/nouveau/nv50/nv50_shader_state.c   |7 -
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c |3 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c|   21 +--
 src/gallium/drivers/r600/r600_pipe.h   |   26 
 src/gallium/drivers/r600/r600_state.c  |2 
 src/gallium/drivers/r600/r600_state_common.c   |   25 
 src/gallium/drivers/r600/sb/sb_bc_finalize.cpp |3 
 src/gallium/drivers/radeonsi/si_hw_context.c   |   17 +-
 src/gallium/drivers/radeonsi/si_shader.h   |1 
 src/gallium/drivers/radeonsi/si_state.c|   24 +++
 src/gallium/drivers/radeonsi/si_state.h|2 
 src/gallium/drivers/radeonsi/si_state_shaders.c|   10 +
 src/gallium/drivers/vc4/vc4_qir.c  |1 
 src/gallium/winsys/amdgpu/drm/amdgpu_bo.c  |3 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c  |3 
 src/glsl/linker.cpp|   64 +-
 src/mesa/drivers/dri/i965/brw_fs.cpp   |8 -
 src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp  |1 
 src/mesa/drivers/dri/i965/intel_blit.c |   72 +--
 src/mesa/drivers/dri/i965/intel_pixel_read.c   |4 
 src/mesa/drivers/dri/i965/intel_tex_subimage.c |4 
 src/mesa/main/formats.c|  106 +
 src/mesa/main/formats.csv  |   16 ++
 src/mesa/main/formats.h|   17 ++
 src/mesa/main/glformats.c  |   32 +
 src/mesa/main/image.c  |   58 -
 src/mesa/main/image.h  |   20 +--
 src/mesa/main/readpix.c|   14 --
 src/mesa/main/texcompress_fxt1.c   |2 
 src/mesa/main/texcompress_s3tc.c   |8 -
 src/mesa/main/texgetimage.c|   21 +--
 src/mesa/main/texstore.c   |   28 ++--
 src/mesa/main/uniform_query.cpp|   35 -
 src/mesa/main/uniforms.c   |   72 +--
 src/mesa/main/uniforms.h   |2 
 src/mesa/state_tracker/st_cb_readpixels.c  |4 
 src/mesa/swrast/s_drawpix.c|   14 +-
 src/mesa/swrast/s_texfetch.c   |   16 ++
 59 files changed, 651 insertions(+), 277 deletions(-)

New commits:
commit 517d01912e779532674572bb938c8a911c9438d0
Author: Timo Aaltonen 
Date:   Mon Sep 7 16:12:11 2015 +0300

release to experimental

diff --git a/debian/changelog b/debian/changelog
index 1aac493..91838da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (11.0.0~rc3-1) UNRELEASED; urgency=medium
+mesa (11.0.0~rc3-1) experimental; urgency=medium
 
   [ Andreas Boll ]
   * Use https for Vcs-* fields.
@@ -6,7 +6,7 @@ mesa (11.0.0~rc3-1) UNRELEASED; urgency=medium
   [ Timo Aaltonen ]
   * New upstream release candidate.
 
- -- Andreas Boll   Wed, 02 Sep 2015 14:20:06 +0200
+ -- Timo Aaltonen   Mon, 07 Sep 2015 15:04:32 +0300
 
 mesa (11.0.0~rc2-1) experimental; urgency=medium
 

commit 4e9908374714d496207724fbe217fbb5373f6048
Author: Timo Aaltonen 
Date:   Mon Sep 7 15:04:04 2015 +0300

update the changelog

diff --git a/debian/changelog b/debian/changelog
index cb5c58d..1aac493 100644
--- 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 VERSION|2 
 debian/changelog   |8 +
 debian/rules   |3 
 src/gallium/auxiliary/util/u_debug.c   |7 -
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c  |   19 +++
 src/gallium/drivers/freedreno/freedreno_context.h  |2 
 src/gallium/drivers/freedreno/freedreno_state.c|4 
 src/gallium/drivers/nouveau/nv50/nv50_state.c  |   10 -
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c |   22 
 src/gallium/drivers/nouveau/nv50/nv50_stateobj.h   |2 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c|6 +
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c|1 
 src/gallium/drivers/r600/r600_asm.c|2 
 src/gallium/drivers/r600/r600_pipe.h   |   31 +++---
 src/gallium/drivers/r600/r600_shader.c |4 
 src/gallium/drivers/r600/sb/sb_bc_decoder.cpp  |1 
 src/gallium/drivers/r600/sb/sb_bc_parser.cpp   |9 +
 src/gallium/drivers/r600/sb/sb_sched.cpp   |2 
 src/gallium/drivers/radeon/r600_query.c|   16 +--
 src/gallium/winsys/radeon/drm/radeon_drm_cs.c  |8 -
 src/gallium/winsys/radeon/drm/radeon_drm_cs.h  |2 
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c  |   12 --
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.h  |1 
 src/mesa/drivers/dri/i965/brw_draw_upload.c|   30 ++---
 src/mesa/drivers/dri/i965/brw_fs.cpp   |4 
 src/mesa/drivers/dri/i965/brw_misc_state.c |3 
 src/mesa/drivers/dri/i965/gen8_draw_upload.c   |   71 ++
 src/mesa/main/get.c|   86 +
 src/mesa/main/texgetimage.c|7 +
 src/mesa/main/teximage.c   |   11 +-
 src/mesa/main/texparam.c   |   12 ++
 src/mesa/main/texstore.c   |2 
 src/mesa/main/uniform_query.cpp|   21 ++--
 src/mesa/main/uniforms.c   |9 -
 34 files changed, 314 insertions(+), 116 deletions(-)

New commits:
commit f5d38c5aaa73c33f5b2de1bd2f3ee2c5e0545d56
Author: Timo Aaltonen 
Date:   Fri Sep 4 17:25:36 2015 +0300

rules: add a missing hunk lost in a merge, oops.

diff --git a/debian/rules b/debian/rules
index 2f0cadd..38f8432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,6 +100,9 @@ else
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.7
+   GALLIUM_DRIVERS += swrast
+  else
+   DRI_DRIVERS += swrast
   endif
 
confflags_DIRECT_RENDERING = --enable-driglx-direct

commit 822902d8dd381e266c677e056b1ea62c71cc7a80
Author: Timo Aaltonen 
Date:   Wed Sep 2 11:38:49 2015 +0300

release to experimental

diff --git a/debian/changelog b/debian/changelog
index cd40081..9dca1ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.0.0~rc2-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Timo Aaltonen   Wed, 02 Sep 2015 11:38:28 +0300
+
 mesa (11.0.0~rc1-1) experimental; urgency=medium
 
   [ Andreas Boll ]

commit 3f8d44210c70f4b16651f1faf5fd72c47c64ab07
Author: Emil Velikov 
Date:   Mon Aug 31 13:40:19 2015 +0100

Update version to 11.0.0-rc2

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 69d3cd2..f25fb60 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.0.0-rc1
+11.0.0-rc2

commit 579ca506aefabc018d2cdd1856de4ce0e95bdfcf
Author: Marek Olšák 
Date:   Sun Aug 23 12:57:09 2015 +0200

gallium/radeon: fix the ADDRESS_HI mask for EVENT_WRITE CIK packets

Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Alex Deucher 
(cherry picked from commit 437cb1e3f482570447501526927df4d80c845bf5)

diff --git a/src/gallium/drivers/radeon/r600_query.c 
b/src/gallium/drivers/radeon/r600_query.c
index 7057aa1..65339bb 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -197,7 +197,7 @@ static void r600_emit_query_begin(struct 
r600_common_context *ctx, struct r600_q
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0));
radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_ZPASS_DONE) | 
EVENT_INDEX(1));
radeon_emit(cs, va);
-   radeon_emit(cs, (va >> 32UL) & 0xFF);
+   radeon_emit(cs, (va >> 32) & 0x);
break;
case PIPE_QUERY_PRIMITIVES_EMITTED:
case PIPE_QUERY_PRIMITIVES_GENERATED:
@@ -206,13 +206,13 @@ static void 

mesa: Changes to 'ubuntu-vivid'

[Timo Aaltonen]

 debian/changelog |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e5d0352476f8af9eef4712c7775c1aa15e3bce9e
Author: Timo Aaltonen 
Date:   Wed Aug 19 21:35:42 2015 +0300

release to vivid

diff --git a/debian/changelog b/debian/changelog
index d5a380b..db66d72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.5.9-2ubuntu1~vivid2) UNRELEASED; urgency=medium
+mesa (10.5.9-2ubuntu1~vivid2) vivid; urgency=medium
 
   * skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in
 certain cases. (LP: #1486522)
 
- -- Timo Aaltonen   Tue, 18 Aug 2015 18:28:20 +0300
+ -- Timo Aaltonen   Wed, 19 Aug 2015 21:32:42 +0300
 
 mesa (10.5.9-2ubuntu1~vivid1) vivid; urgency=medium
 

commit a28e0230b7610b4bf48c6353d4614e379b001f87
Author: Timo Aaltonen 
Date:   Wed Aug 19 15:24:07 2015 +0300

close a bug

diff --git a/debian/changelog b/debian/changelog
index fcdb75b..d5a380b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 mesa (10.5.9-2ubuntu1~vivid2) UNRELEASED; urgency=medium
 
   * skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in
-certain cases.
+certain cases. (LP: #1486522)
 
  -- Timo Aaltonen   Tue, 18 Aug 2015 18:28:20 +0300
 

mesa: Changes to 'ubuntu-vivid-lts'

[Timo Aaltonen]

 debian/changelog|   19 +++-
 debian/patches/series   |2 
 debian/patches/skl-dont-use-the-pma-depth-stall-workaround.diff |   43 
++
 3 files changed, 58 insertions(+), 6 deletions(-)

New commits:
commit 4d29a5ce80fb25a5524de282dbc9ad3324ffda0f
Author: Timo Aaltonen 
Date:   Wed Aug 19 21:43:38 2015 +0300

release to trusty

diff --git a/debian/changelog b/debian/changelog
index 80373f0..0433b99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa-lts-vivid (10.5.9-2ubuntu1~trusty2) trusty; urgency=medium
+
+  * Backport vivid package for lts-vivid stack.
+
+ -- Timo Aaltonen   Wed, 19 Aug 2015 21:37:31 +0300
+
 mesa (10.5.9-2ubuntu1~vivid2) vivid; urgency=medium
 
   * skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in

commit e5d0352476f8af9eef4712c7775c1aa15e3bce9e
Author: Timo Aaltonen 
Date:   Wed Aug 19 21:35:42 2015 +0300

release to vivid

diff --git a/debian/changelog b/debian/changelog
index d5a380b..db66d72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.5.9-2ubuntu1~vivid2) UNRELEASED; urgency=medium
+mesa (10.5.9-2ubuntu1~vivid2) vivid; urgency=medium
 
   * skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in
 certain cases. (LP: #1486522)
 
- -- Timo Aaltonen   Tue, 18 Aug 2015 18:28:20 +0300
+ -- Timo Aaltonen   Wed, 19 Aug 2015 21:32:42 +0300
 
 mesa (10.5.9-2ubuntu1~vivid1) vivid; urgency=medium
 

commit a28e0230b7610b4bf48c6353d4614e379b001f87
Author: Timo Aaltonen 
Date:   Wed Aug 19 15:24:07 2015 +0300

close a bug

diff --git a/debian/changelog b/debian/changelog
index fcdb75b..d5a380b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 mesa (10.5.9-2ubuntu1~vivid2) UNRELEASED; urgency=medium
 
   * skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in
-certain cases.
+certain cases. (LP: #1486522)
 
  -- Timo Aaltonen   Tue, 18 Aug 2015 18:28:20 +0300
 

commit 35bd76aff111bc3f9734c47835450d6d3078729e
Author: Timo Aaltonen 
Date:   Tue Aug 18 18:28:31 2015 +0300

skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in certain 
cases.

diff --git a/debian/changelog b/debian/changelog
index 5bf44f6..fcdb75b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.5.9-2ubuntu1~vivid2) UNRELEASED; urgency=medium
+
+  * skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in
+certain cases.
+
+ -- Timo Aaltonen   Tue, 18 Aug 2015 18:28:20 +0300
+
 mesa (10.5.9-2ubuntu1~vivid1) vivid; urgency=medium
 
   * Backport to vivid. (LP: #1471213)
diff --git a/debian/patches/series b/debian/patches/series
index 9a96a43..bc69930 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@ i965-store-the-gpu-revision.diff
 i965-refactor-simd16-to-2xsimd8-checks.diff
 i965-define-i915-param-revision.diff
 skl-break-down-simd16-3-source-instructions.diff
+
+skl-dont-use-the-pma-depth-stall-workaround.diff
diff --git a/debian/patches/skl-dont-use-the-pma-depth-stall-workaround.diff 
b/debian/patches/skl-dont-use-the-pma-depth-stall-workaround.diff
new file mode 100644
index 000..a64f864
--- /dev/null
+++ b/debian/patches/skl-dont-use-the-pma-depth-stall-workaround.diff
@@ -0,0 +1,43 @@
+commit 74fd226e34d0cf5e9ff43174ae69b4a66f5de1ab
+Author: Ben Widawsky 
+Date:   Wed Mar 25 16:52:46 2015 -0700
+
+i965/skl: Don't use the PMA depth stall workaround
+
+The PMA depth stall must be enabled (optimization turned off) under certain
+circumstances on gen8. This was supposedly fixed for Gen9, which means we 
do not
+need to check, or toggle the state. The hardware is supposed to enable the
+hardware optimization by default, unlike BDW, so we also don't need to set 
it at
+init. For whatever reason this improves stability on ETQW with the bug 
mentioned
+below.
+
+References: https://bugs.freedesktop.org/show_bug.cgi?id=89039 (doesn't 
fix)
+Signed-off-by: Ben Widawsky 
+Tested-by: Anuj Phogat 
+Reviewed-by: Kenneth Graunke 
+
+diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c 
b/src/mesa/drivers/dri/i965/gen8_depth_state.c
+index c6494c9..3d126cf 100644
+--- a/src/mesa/drivers/dri/i965/gen8_depth_state.c
 b/src/mesa/drivers/dri/i965/gen8_depth_state.c
+@@ -368,6 +368,10 @@ static void
+ gen8_emit_pma_stall_workaround(struct brw_context *brw)
+ {
+uint32_t bits = 0;
++
++   if (brw->gen >= 9)
++  return;
++
+if (pma_fix_enable(brw))
+   bits |= GEN8_HIZ_NP_PMA_FIX_ENABLE | GEN8_HIZ_NP_EARLY_Z_FAILS_DISABLE;
+ 
+@@ -400,7 +404,8 @@ 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 Makefile.am   |4 
 VERSION   |2 
 configure.ac  |  151 -
 debian/changelog  |   16 
 debian/control|   12 
 debian/libgl1-mesa-glx-i686.install.in|1 
 debian/not-installed  |2 
 debian/rules  |3 
 docs/GL3.txt  |6 
 docs/index.html   |6 
 docs/relnotes.html|1 
 docs/relnotes/10.6.5.html |  124 
 docs/relnotes/11.0.0.html |7 
 include/GL/glext.h|  294 ++
 src/egl/drivers/dri2/platform_drm.c   |   10 
 src/egl/drivers/dri2/platform_wayland.c   |4 
 src/gallium/auxiliary/tgsi/tgsi_text.c|   23 
 src/gallium/auxiliary/util/u_blitter.c|   54 
 src/gallium/auxiliary/util/u_blitter.h|3 
 src/gallium/auxiliary/util/u_surface.c|3 
 src/gallium/drivers/freedreno/a3xx/fd3_format.c   |   11 
 src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c   |2 
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c  |2 
 src/gallium/drivers/freedreno/freedreno_context.c |4 
 src/gallium/drivers/freedreno/freedreno_fence.c   |   25 
 src/gallium/drivers/freedreno/freedreno_fence.h   |5 
 src/gallium/drivers/freedreno/freedreno_resource.c|8 
 src/gallium/drivers/freedreno/ir3/ir3_ra.c|2 
 src/gallium/drivers/i915/i915_surface.c   |3 
 src/gallium/drivers/nouveau/Makefile.sources  |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir.h |8 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp|1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |   12 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h   |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |  253 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp|5 
 src/gallium/drivers/nouveau/codegen/unordered_set.h   |   48 
 src/gallium/drivers/nouveau/nouveau_compiler.c|4 
 src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c  |3 
 src/gallium/drivers/r300/r300_blit.c  |3 
 src/gallium/drivers/r600/r600_blit.c  |3 
 src/gallium/drivers/r600/r600_isa.h   |2 
 src/gallium/drivers/r600/r600_pipe.h  |4 
 src/gallium/drivers/r600/r600_shader.c|   30 
 src/gallium/drivers/r600/r600_shader.h|   20 
 src/gallium/drivers/r600/r600_state_common.c  |   42 
 src/gallium/drivers/radeon/radeon_uvd.c   |5 
 src/gallium/drivers/radeonsi/si_blit.c|3 
 src/gallium/drivers/radeonsi/si_shader.c  |   19 
 src/gallium/drivers/vc4/vc4_context.h |1 
 src/gallium/drivers/vc4/vc4_opt_algebraic.c   |   33 
 src/gallium/drivers/vc4/vc4_opt_copy_propagation.c|   22 
 src/gallium/drivers/vc4/vc4_opt_vpm_writes.c  |   18 
 src/gallium/drivers/vc4/vc4_program.c |   96 
 src/gallium/drivers/vc4/vc4_qir.c |   38 
 src/gallium/drivers/vc4/vc4_qir.h |   47 
 src/gallium/drivers/vc4/vc4_qpu.h |7 
 src/gallium/drivers/vc4/vc4_qpu_disasm.c  |   16 
 src/gallium/drivers/vc4/vc4_qpu_emit.c|   63 
 src/gallium/drivers/vc4/vc4_register_allocate.c   |   42 
 src/gallium/include/pipe/p_state.h|1 
 src/gallium/state_trackers/clover/llvm/invocation.cpp |   33 
 src/gallium/state_trackers/nine/adapter9.c|   38 
 src/gallium/state_trackers/nine/basetexture9.c|   46 
 src/gallium/state_trackers/nine/basetexture9.h|6 
 src/gallium/state_trackers/nine/cubetexture9.c|   27 
 src/gallium/state_trackers/nine/device9.c |  436 ++-
 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 Android.common.mk  |9 
 Android.mk |   15 
 CleanSpec.mk   |1 
 VERSION|2 
 bin/bugzilla_mesa.sh   |   13 
 configure.ac   |  285 
 debian/changelog   |   43 
 debian/control |   25 
 debian/libegl1-mesa.symbols|   10 
 debian/libgles2-mesa.symbols   |   17 
 debian/patches/egl-platform-mir.patch  |  112 
 debian/rules   |   11 
 docs/GL3.txt   |   81 
 docs/devinfo.html  |  400 
 docs/egl.html  |6 
 docs/index.html|   59 
 docs/relnotes.html |9 
 docs/relnotes/10.5.6.html  |  147 
 docs/relnotes/10.5.7.html  |  103 
 docs/relnotes/10.5.8.html  |  112 
 docs/relnotes/10.5.9.html  |  140 
 docs/relnotes/10.6.3.html  |3 
 docs/relnotes/10.6.4.html  |  137 
 docs/relnotes/11.0.0.html  |   89 
 doxygen/.gitignore |1 
 doxygen/Makefile   |1 
 include/EGL/egl.h  |  562 -
 include/EGL/eglext.h   |  258 
 include/EGL/eglmesaext.h   |   33 
 include/EGL/eglplatform.h  |   19 
 include/GL/glext.h |5 
 include/GL/glx.h   |   92 
 include/GL/internal/dri_interface.h|   31 
 include/KHR/khrplatform.h  |   19 
 include/c99_math.h |   12 
 include/pci_ids/i965_pci_ids.h |3 
 include/pci_ids/radeonsi_pci_ids.h |   25 
 scons/gallium.py   |1 
 scons/llvm.py  |4 
 src/Makefile.am|   10 
 src/SConscript |7 
 src/egl/Android.mk |   97 
 src/egl/Makefile.am|  119 
 src/egl/Makefile.sources   |   34 
 src/egl/SConscript |   34 
 src/egl/drivers/dri2/Android.mk|   64 
 src/egl/drivers/dri2/Makefile.am   |   68 
 src/egl/drivers/dri2/SConscript|   40 
 src/egl/drivers/dri2/egl_dri2.c|  353 
 src/egl/drivers/dri2/egl_dri2.h|   16 
 src/egl/drivers/dri2/platform_android.c|   11 
 src/egl/drivers/dri2/platform_drm.c|   26 
 src/egl/drivers/dri2/platform_surfaceless.c|  162 
 src/egl/drivers/dri2/platform_wayland.c|   89 
 src/egl/drivers/dri2/platform_x11.c|  157 
 src/egl/drivers/haiku/SConscript   |   34 
 src/egl/drivers/haiku/egl_haiku.cpp|  290 
 src/egl/main/Android.mk|  164 
 src/egl/main/Makefile.am   |   98 
 src/egl/main/Makefile.sources  |   31 
 src/egl/main/SConscript|   52 
 src/egl/main/eglapi.c  |  327 
 src/egl/main/eglapi.h

mesa: Changes to 'ubuntu-vivid'

[Timo Aaltonen]

 debian/changelog|7 +
 debian/patches/series   |2 
 debian/patches/skl-dont-use-the-pma-depth-stall-workaround.diff |   43 
++
 3 files changed, 52 insertions(+)

New commits:
commit 35bd76aff111bc3f9734c47835450d6d3078729e
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Aug 18 18:28:31 2015 +0300

skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in certain 
cases.

diff --git a/debian/changelog b/debian/changelog
index 5bf44f6..fcdb75b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.5.9-2ubuntu1~vivid2) UNRELEASED; urgency=medium
+
+  * skl-dont-use-the-pma-depth-stall-workaround.diff: Fix GPU hangs in
+certain cases.
+
+ -- Timo Aaltonen tjaal...@debian.org  Tue, 18 Aug 2015 18:28:20 +0300
+
 mesa (10.5.9-2ubuntu1~vivid1) vivid; urgency=medium
 
   * Backport to vivid. (LP: #1471213)
diff --git a/debian/patches/series b/debian/patches/series
index 9a96a43..bc69930 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@ i965-store-the-gpu-revision.diff
 i965-refactor-simd16-to-2xsimd8-checks.diff
 i965-define-i915-param-revision.diff
 skl-break-down-simd16-3-source-instructions.diff
+
+skl-dont-use-the-pma-depth-stall-workaround.diff
diff --git a/debian/patches/skl-dont-use-the-pma-depth-stall-workaround.diff 
b/debian/patches/skl-dont-use-the-pma-depth-stall-workaround.diff
new file mode 100644
index 000..a64f864
--- /dev/null
+++ b/debian/patches/skl-dont-use-the-pma-depth-stall-workaround.diff
@@ -0,0 +1,43 @@
+commit 74fd226e34d0cf5e9ff43174ae69b4a66f5de1ab
+Author: Ben Widawsky benjamin.widaw...@intel.com
+Date:   Wed Mar 25 16:52:46 2015 -0700
+
+i965/skl: Don't use the PMA depth stall workaround
+
+The PMA depth stall must be enabled (optimization turned off) under certain
+circumstances on gen8. This was supposedly fixed for Gen9, which means we 
do not
+need to check, or toggle the state. The hardware is supposed to enable the
+hardware optimization by default, unlike BDW, so we also don't need to set 
it at
+init. For whatever reason this improves stability on ETQW with the bug 
mentioned
+below.
+
+References: https://bugs.freedesktop.org/show_bug.cgi?id=89039 (doesn't 
fix)
+Signed-off-by: Ben Widawsky b...@bwidawsk.net
+Tested-by: Anuj Phogat anuj.pho...@intel.com
+Reviewed-by: Kenneth Graunke kenn...@whitecape.org
+
+diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c 
b/src/mesa/drivers/dri/i965/gen8_depth_state.c
+index c6494c9..3d126cf 100644
+--- a/src/mesa/drivers/dri/i965/gen8_depth_state.c
 b/src/mesa/drivers/dri/i965/gen8_depth_state.c
+@@ -368,6 +368,10 @@ static void
+ gen8_emit_pma_stall_workaround(struct brw_context *brw)
+ {
+uint32_t bits = 0;
++
++   if (brw-gen = 9)
++  return;
++
+if (pma_fix_enable(brw))
+   bits |= GEN8_HIZ_NP_PMA_FIX_ENABLE | GEN8_HIZ_NP_EARLY_Z_FAILS_DISABLE;
+ 
+@@ -400,7 +404,8 @@ gen8_hiz_exec(struct brw_context *brw, struct 
intel_mipmap_tree *mt,
+   return;
+ 
+/* Disable the PMA stall fix since we're about to do a HiZ operation. */
+-   write_pma_stall_bits(brw, 0);
++   if (brw-gen == 8)
++  write_pma_stall_bits(brw, 0);
+ 
+assert(mt-first_level == 0);
+assert(mt-logical_depth0 = 1);

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 .gitignore   |
1 
 Android.common.mk|
4 
 Android.mk   |   
10 
 CleanSpec.mk |
8 
 Makefile.am  |   
16 
 VERSION  |
2 
 autogen.sh   |
4 
 bin/.cherry-ignore   |   
29 
 bin/get-pick-list.sh |
2 
 common.py|   
97 
 configure.ac |  
159 
 debian/changelog |   
21 
 debian/libegl1-mesa.symbols  |   
36 
 debian/libgles1-mesa.symbols |
2 
 debian/libgles2-mesa.symbols |
2 
 debian/mesa-common-dev.docs  |   
12 
 debian/not-installed |
1 
 debian/patches/egl-platform-mir.patch|  
208 
 debian/patches/i965-define-i915-param-revision.diff  |   
27 
 debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch|   
29 
 debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff   |   
72 
 debian/patches/i965-store-the-gpu-revision.diff  |   
80 
 debian/patches/series|
8 
 debian/patches/skl-break-down-simd16-3-source-instructions.diff  |   
34 
 debian/patches/skl-use-vec4-datatypes-for-message-header.diff|   
47 
 debian/source/local-options  |
2 
 docs/GL3.txt |  
131 
 docs/README.WIN32|
4 
 docs/VERSIONS|
4 
 docs/contents.html   |
1 
 docs/dispatch.html   |
5 
 docs/egl.html|   
51 
 docs/envvars.html|
1 
 docs/faq.html|   
13 
 docs/index.html  |   
57 
 docs/install.html|
9 
 docs/libGL.txt   |
2 
 docs/llvmpipe.html   |   
32 
 docs/openvg.html |   
59 
 docs/relnotes.html   |
9 
 docs/relnotes/10.0.3.html|
2 
 docs/relnotes/10.4.5.html|  
114 
 docs/relnotes/10.4.6.html|  
143 
 docs/relnotes/10.4.7.html|  
134 
 docs/relnotes/10.5.6.html|  
147 
 docs/relnotes/10.5.7.html|  
103 
 docs/relnotes/10.5.8.html|  
112 
 docs/relnotes/10.5.9.html|  
139 
 docs/relnotes/10.6.0.html|  
331 +
 docs/relnotes/10.6.1.html|  
104 
 docs/relnotes/10.6.2.html|  
165 
 docs/relnotes/10.6.3.html|  
105 
 docs/relnotes/7.10.html  |
2 
 docs/relnotes/7.6.html   |
2 
 docs/sourcetree.html |
2 
 docs/specs/MESA_image_dma_buf_export.txt |  
147 
 docs/versions.html   |
4 
 docs/viewperf.html   |  
101 
 include/EGL/eglmesaext.h |   
70 
 include/GL/internal/dri_interface.h  |   
64 
 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 VERSION   |2 
 configure.ac  |  145 
 debian/changelog  |   17 
 debian/libegl1-mesa.symbols   |3 
 debian/mesa-common-dev.docs   |   12 
 debian/source/local-options   |2 
 docs/relnotes/10.6.1.html |3 
 docs/relnotes/10.6.2.html |  165 +
 docs/relnotes/10.6.3.html |  105 +++
 src/gallium/auxiliary/vl/vl_mpeg12_decoder.c  |   24 
 src/gallium/auxiliary/vl/vl_mpeg12_decoder.h  |4 
 src/gallium/auxiliary/vl/vl_winsys_dri.c  |   17 
 src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp|3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp|   10 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp |   12 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |   42 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |5 
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c|   18 
 src/gallium/drivers/nouveau/nv50/nv50_tex.c   |   11 
 src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c|   18 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c   |7 
 src/gallium/drivers/r600/r600_blit.c  |7 
 src/gallium/drivers/radeonsi/si_state_draw.c  |4 
 src/gallium/state_trackers/dri/dri2.c |2 
 src/gallium/state_trackers/osmesa/osmesa.c|2 
 src/gallium/state_trackers/vdpau/mixer.c  |   22 
 src/gallium/state_trackers/xa/xa_context.c|6 
 src/gallium/state_trackers/xa/xa_tracker.c|2 
 src/gallium/state_trackers/xa/xa_yuv.c|2 
 src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c   |6 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |   28 
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c |   17 
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.h |1 
 src/glsl/ast_array_index.cpp  |   38 -
 src/glsl/linker.cpp   |   77 ++
 src/glsl/loop_unroll.cpp  |   12 
 src/glsl/opt_algebraic.cpp|4 
 src/loader/loader.c   |   46 -
 src/mesa/Makefile.am  |5 
 src/mesa/drivers/common/meta.c|4 
 src/mesa/drivers/dri/i915/i915_context.c  |3 
 src/mesa/drivers/dri/i965/brw_context.c   |4 
 src/mesa/drivers/dri/i965/brw_context.h   |1 
 src/mesa/drivers/dri/i965/brw_defines.h   |   12 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |   20 
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp  |   19 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp  |7 
 src/mesa/drivers/dri/i965/brw_program.c   |   11 
 src/mesa/drivers/dri/i965/gen6_cc.c   |2 
 src/mesa/drivers/dri/i965/gen8_ps_state.c |3 
 src/mesa/drivers/dri/i965/gen8_surface_state.c|3 
 src/mesa/drivers/dri/i965/intel_batchbuffer.h |4 
 src/mesa/drivers/osmesa/osmesa.c  |2 
 src/mesa/main/mtypes.h|1 
 src/mesa/main/texstore.c  |1 
 src/mesa/program/prog_opt_constant_fold.c |2 
 src/mesa/program/program_parse_extra.c|   50 +
 src/mesa/state_tracker/st_context.c   |5 
 src/util/Makefile.am  |7 
 src/util/Makefile.sources |4 
 src/util/SConscript   |5 
 src/util/mesa-sha1.c  |  316 --
 src/util/mesa-sha1.h  |   53 -
 65 files changed, 783 insertions(+), 669 deletions(-)

New commits:
commit 30b98e8f2120d491fa5282cb307d5ebaa186cbd7
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Jul 28 12:44:36 2015 +0300

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 31dd195..6b5cbc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |   13 
 debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch |   29 
++
 debian/patches/series |1 
 3 files changed, 43 insertions(+)

New commits:
commit c42a7480b28c1b9eb652d3262c2acd00454c49a1
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jul 10 14:06:44 2015 +0300

release to wily

diff --git a/debian/changelog b/debian/changelog
index c1bff45..4677962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.5.9-2ubuntu1) wily; urgency=medium
+
+  * Merge from Debian unstable.
+
+ -- Timo Aaltonen tjaal...@debian.org  Fri, 10 Jul 2015 14:02:38 +0300
+
 mesa (10.5.9-2) unstable; urgency=medium
 
   * i965-do_blit_drawpixels-decode-array-formats.patch: Fix a regression

commit 7ced45cd145fdbea4403dac5896ad79b9fc64582
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jul 10 13:02:07 2015 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 2767303..3a5b275 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.5.9-2) UNRELEASED; urgency=medium
+mesa (10.5.9-2) unstable; urgency=medium
 
   * i965-do_blit_drawpixels-decode-array-formats.patch: Fix a regression
 since 10.5.5, allow using blit fastpath again.
 
- -- Timo Aaltonen tjaal...@debian.org  Fri, 10 Jul 2015 13:01:13 +0300
+ -- Timo Aaltonen tjaal...@debian.org  Fri, 10 Jul 2015 13:01:40 +0300
 
 mesa (10.5.9-1) unstable; urgency=medium
 

commit 799eeaa9becbb872d68ed9ffbb16612839449044
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jul 10 13:01:21 2015 +0300

i965-do_blit_drawpixels-decode-array-formats.patch: Fix a regression since 
10.5.5, allow using blit fastpath again.

diff --git a/debian/changelog b/debian/changelog
index 080d6f0..2767303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.5.9-2) UNRELEASED; urgency=medium
+
+  * i965-do_blit_drawpixels-decode-array-formats.patch: Fix a regression
+since 10.5.5, allow using blit fastpath again.
+
+ -- Timo Aaltonen tjaal...@debian.org  Fri, 10 Jul 2015 13:01:13 +0300
+
 mesa (10.5.9-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch 
b/debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch
new file mode 100644
index 000..5808155
--- /dev/null
+++ b/debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch
@@ -0,0 +1,29 @@
+commit bd38f91f8d80897ca91979962d80d4bc0acef586
+Author: Alexander Monakov amona...@gmail.com
+Date:   Tue Jun 9 20:58:22 2015 +0300
+
+i965: do_blit_drawpixels: decode array formats
+
+Correct a regression introduced by commit 922c0c9fd526 by converting array
+format, if received from _mesa_format_from_format_and_type, to 
mesa_format.
+
+References: https://bugs.freedesktop.org/show_bug.cgi?id=90839
+Signed-off-by: Alexander Monakov amona...@gmail.com
+Tested-by: AnAkkk anakin...@gmail.com
+Reviewed-by: Jason Ekstrand jason.ekstr...@intel.com
+Reviewed-by: Kenneth Graunke kenn...@whitecape.org
+Cc: mesa-sta...@lists.freedesktop.org
+
+diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c 
b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
+index d68cbb6..189a592 100644
+--- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c
 b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
+@@ -78,6 +78,8 @@ do_blit_drawpixels(struct gl_context * ctx,
+struct intel_renderbuffer *irb = intel_renderbuffer(rb);
+ 
+mesa_format src_format = _mesa_format_from_format_and_type(format, type);
++   if (_mesa_format_is_mesa_array_format(src_format))
++  src_format = _mesa_format_from_array_format(src_format);
+mesa_format dst_format = irb-mt-format;
+ 
+/* We can safely discard sRGB encode/decode for the DrawPixels interface */
diff --git a/debian/patches/series b/debian/patches/series
index 9f0749f..11e1fc6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 07_gallium-fix-build-failure-on-powerpcspe.diff
+i965-do_blit_drawpixels-decode-array-formats.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zdwpd-0004kz...@moszumanska.debian.org

mesa: Changes to 'ubuntu-vivid'

[Timo Aaltonen]

New branch 'ubuntu-vivid' available with the following commits:
commit 5a4eca47d7a1310d3e459d9ab55b893dec0f3b00
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jul 10 14:08:51 2015 +0300

update the changelog

commit 83feb002d91de08d9959c3309a4547e281a9bcae
Merge: d3c1515 c42a748
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jul 10 14:08:15 2015 +0300

Merge branch 'ubuntu' into ubuntu-vivid

commit d3c15151b86d0f2062ca624ab3d2a9c979d0a495
Author: Timo Aaltonen tjaal...@debian.org
Date:   Wed Jul 8 11:36:38 2015 +0300

backport to vivid


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zdwpk-0004p0...@moszumanska.debian.org

mesa: Changes to 'ubuntu-vivid-lts'

[Timo Aaltonen]

New branch 'ubuntu-vivid-lts' available with the following commits:
commit 0c537bbffdbe857aff8b2e5967210b6f9ba7d202
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jul 10 14:10:23 2015 +0300

update the changelog

commit ed72144b2ea0b7954e9007d7ba1560bf81753887
Merge: 87401a1 5a4eca4
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jul 10 14:09:34 2015 +0300

Merge branch 'ubuntu-vivid' into ubuntu-vivid-lts

commit 87401a11b17421425ddc64d61e9aa2429198fca0
Author: Timo Aaltonen tjaal...@debian.org
Date:   Wed Jul 8 11:42:02 2015 +0300

Backport vivid package for lts-vivid stack.

commit 8554c3366d619261ccb3f111d29984988ed42751
Merge: 177db04 d3c1515
Author: Timo Aaltonen tjaal...@debian.org
Date:   Wed Jul 8 11:38:40 2015 +0300

Merge branch 'ubuntu-vivid' into ubuntu-vivid-lts

Conflicts:
debian/control

commit 177db04c0584d0e6115108ee19f4943a37924a4e
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri May 8 15:06:38 2015 +0300

Backport vivid package for lts-vivid stack.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zdwq4-0004yy...@moszumanska.debian.org

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 6a2a8869c558d762cb57dcb0bcd046c4d90ecc9d
Author: Timo Aaltonen tjaal...@debian.org
Date:   Mon Jul 6 13:58:50 2015 +0300

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 8843677..6c165f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (10.6.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from debian-experimental git.
+  * Drop skl-*, i965-* patches, upstream.
+  * egl-platform-mir.patch: Updated.
+
+ -- Timo Aaltonen tjaal...@debian.org  Thu, 18 Jun 2015 15:31:27 +0300
+
 mesa (10.6.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
@@ -7,14 +15,6 @@ mesa (10.6.1-1) UNRELEASED; urgency=medium
 
  -- Timo Aaltonen tjaal...@debian.org  Mon, 27 Apr 2015 10:43:45 +0300
 
-mesa (10.6.0-0ubuntu1) UNRELEASED; urgency=medium
-
-  * Merge from debian-experimental git.
-  * Drop skl-* patches, upstream.
-  * egl-platform-mir.patch: Updated.
-
- -- Timo Aaltonen tjaal...@debian.org  Thu, 18 Jun 2015 15:31:27 +0300
-
 mesa (10.5.9-1ubuntu1) wily; urgency=medium
 
   * Merge from Debian unstable.

commit e83b9a9bacf706a2916a9db09bfe03bc20efb05d
Author: Timo Aaltonen tjaal...@debian.org
Date:   Mon Jun 22 22:43:12 2015 +0300

egl-platform-mir.patch: Updated.

diff --git a/debian/changelog b/debian/changelog
index 5ea7053..4b4a508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (10.6.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * Merge from debian-experimental git.
   * Drop skl-* patches, upstream.
+  * egl-platform-mir.patch: Updated.
 
  -- Timo Aaltonen tjaal...@debian.org  Thu, 18 Jun 2015 15:31:27 +0300
 
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 9b91700..fea1f21 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,8 +1,8 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1636,7 +1636,9 @@ for plat in $egl_platforms; do
+@@ -1779,7 +1779,9 @@ for plat in $egl_platforms; do
  
-   android|fbdev|gdi|null)
+   android|gdi|null)
;;
 -
 +mir)
@@ -11,9 +11,9 @@
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
;;
-@@ -1665,6 +1667,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND
+@@ -1807,6 +1809,7 @@ AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, ec
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo $egl_platforms | grep -q 
'wayland')
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo $egl_platforms | grep -q 'drm')
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo $egl_platforms | grep -q 
'fbdev')
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo $egl_platforms | grep -q 'null')
 +AM_CONDITIONAL(HAVE_EGL_PLATFORM_MIR, echo $egl_platforms | grep -q 'mir')
  
@@ -37,7 +37,7 @@
  #if defined(MESA_EGL_NO_X11_HEADERS)
 --- a/include/GL/internal/dri_interface.h
 +++ b/include/GL/internal/dri_interface.h
-@@ -833,10 +833,12 @@ struct __DRIbufferRec {
+@@ -893,10 +893,12 @@ struct __DRIbufferRec {
  unsigned int pitch;
  unsigned int cpp;
  unsigned int flags;
@@ -66,7 +66,7 @@
  EXTRA_DIST = SConscript
 --- a/src/egl/drivers/dri2/egl_dri2.c
 +++ b/src/egl/drivers/dri2/egl_dri2.c
-@@ -651,6 +651,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
+@@ -677,6 +677,12 @@ dri2_initialize(_EGLDriver *drv, _EGLDis
   return EGL_TRUE;
return dri2_initialize_wayland(drv, disp);
  #endif
@@ -79,7 +79,7 @@
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
if (disp-Options.TestOnly)
-@@ -700,6 +706,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+@@ -726,6 +732,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
}
break;
  #endif
@@ -92,8 +92,8 @@
 +#endif
  #ifdef HAVE_WAYLAND_PLATFORM
 case _EGL_PLATFORM_WAYLAND:
-   wl_drm_destroy(dri2_dpy-wl_drm);
-@@ -716,7 +729,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+   if (dri2_dpy-wl_drm)
+@@ -747,7 +760,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
  * the ones from the gbm device. As such the gbm itself is responsible
  * for the cleanup.
  */
@@ -105,7 +105,7 @@
free(dri2_dpy-driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
-@@ -64,6 +64,10 @@
+@@ -66,6 +66,10 @@
  
  #endif /* HAVE_ANDROID_PLATFORM */
  
@@ -116,9 +116,9 @@
  #include eglconfig.h
  #include eglcontext.h
  #include egldisplay.h
-@@ -197,6 +201,10 @@ struct dri2_egl_display
-int formats;
-uint32_t  capabilities;
+@@ -204,6 +208,10 @@ struct dri2_egl_display
+int is_render_node;
+int is_different_gpu;
  #endif
 +
 +#ifdef HAVE_MIR_PLATFORM
@@ -127,22 +127,21 @@
  };
  
  struct dri2_egl_context
-@@ -243,16 +251,21 @@ struct dri2_egl_surface
+@@ -250,7 +258,7 @@ struct dri2_egl_surface
 struct gbm_dri_surface *gbm_surf;
  #endif
  
 -#if defined(HAVE_WAYLAND_PLATFORM) || 

mesa: Changes to 'ubuntu+1'

[Timo Aaltonen]

 debian/patches/i965-define-i915-param-revision.diff |   27 ---
 debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff  |   72 
-
 debian/patches/i965-store-the-gpu-revision.diff |   80 
--
 debian/patches/skl-break-down-simd16-3-source-instructions.diff |   34 
 4 files changed, 213 deletions(-)

New commits:
commit 223af6b1ca12cb0c761a98767932d7cc7cc9b8cb
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Jul 7 01:29:37 2015 +0300

actually remove the backported patches too

diff --git a/debian/patches/i965-define-i915-param-revision.diff 
b/debian/patches/i965-define-i915-param-revision.diff
deleted file mode 100644
index 1d0c831..000
--- a/debian/patches/i965-define-i915-param-revision.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 484f9f4fcd53fcaa768e63934a5f74346bfb46a9
-Author: Dave Airlie airl...@redhat.com
-Date:   Mon Mar 23 09:54:52 2015 +1000
-
-i965: define I915_PARAM_REVISION
-
-we are broken against the libdrm 2.4.60 minimum specified,
-so fix it for now.
-
-Signed-off-by: Dave Airlie airl...@redhat.com
-
-diff --git a/src/mesa/drivers/dri/i965/brw_context.c 
b/src/mesa/drivers/dri/i965/brw_context.c
-index 0d3af2c..a39443a 100644
 a/src/mesa/drivers/dri/i965/brw_context.c
-+++ b/src/mesa/drivers/dri/i965/brw_context.c
-@@ -658,6 +658,11 @@ brw_process_driconf_options(struct brw_context *brw)
-   driQueryOptionb(options, allow_glsl_extension_directive_midshader);
- }
- 
-+/* drop when libdrm 2.4.61 is released */
-+#ifndef I915_PARAM_REVISION
-+#define I915_PARAM_REVISION 32
-+#endif
-+
- static int
- brw_get_revision(int fd)
- {
diff --git a/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff 
b/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff
deleted file mode 100644
index c595ea2..000
--- a/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-commit bc4b18d2977a94a6fb513bf5955236a0e92298ca
-Author: Neil Roberts n...@linux.intel.com
-Date:   Thu Mar 19 18:18:49 2015 +
-
-i965: Refactor SIMD16-to-2xSIMD8 checks.
-
-The places that were checking whether 3-source instructions are
-supported have now been combined into a small helper function. This
-will be used in the next patch to add an additonal restriction.
-
-Based on a patch by Kenneth Graunke.
-
-Reviewed-by: Kenneth Graunke kenn...@whitecape.org
-Reviewed-by: Matt Turner matts...@gmail.com
-
-diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp 
b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
-index 05a2db4..6eebee1 100644
 a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
-+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
-@@ -1553,6 +1553,15 @@ fs_generator::enable_debug(const char *shader_name)
-this-shader_name = shader_name;
- }
- 
-+/**
-+ * Some hardware doesn't support SIMD16 instructions with 3 sources.
-+ */
-+static bool
-+brw_supports_simd16_3src(const struct brw_context *brw)
-+{
-+   return brw-is_haswell || brw-gen = 8;
-+}
-+
- int
- fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
- {
-@@ -1646,7 +1655,7 @@ fs_generator::generate_code(const cfg_t *cfg, int 
dispatch_width)
-   case BRW_OPCODE_MAD:
-  assert(brw-gen = 6);
-brw_set_default_access_mode(p, BRW_ALIGN_16);
-- if (dispatch_width == 16  brw-gen  8  !brw-is_haswell) {
-+ if (dispatch_width == 16  !brw_supports_simd16_3src(brw)) {
-   brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
- brw_inst *f = brw_MAD(p, firsthalf(dst), firsthalf(src[0]), 
firsthalf(src[1]), firsthalf(src[2]));
-   brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF);
-@@ -1667,7 +1676,7 @@ fs_generator::generate_code(const cfg_t *cfg, int 
dispatch_width)
-   case BRW_OPCODE_LRP:
-  assert(brw-gen = 6);
-brw_set_default_access_mode(p, BRW_ALIGN_16);
-- if (dispatch_width == 16  brw-gen  8  !brw-is_haswell) {
-+ if (dispatch_width == 16  !brw_supports_simd16_3src(brw)) {
-   brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
- brw_inst *f = brw_LRP(p, firsthalf(dst), firsthalf(src[0]), 
firsthalf(src[1]), firsthalf(src[2]));
-   brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF);
-@@ -1804,7 +1813,7 @@ fs_generator::generate_code(const cfg_t *cfg, int 
dispatch_width)
-   case BRW_OPCODE_BFE:
-  assert(brw-gen = 7);
-  brw_set_default_access_mode(p, BRW_ALIGN_16);
-- if (dispatch_width == 16  brw-gen  8  !brw-is_haswell) {
-+ if (dispatch_width == 16  !brw_supports_simd16_3src(brw)) {
- brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
- brw_BFE(p, firsthalf(dst), firsthalf(src[0]), firsthalf(src[1]), 
firsthalf(src[2]));
- brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF);
-@@ -1844,7 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog|   10 +
 debian/patches/i965-define-i915-param-revision.diff |   27 +++
 debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff  |   72 
+
 debian/patches/i965-store-the-gpu-revision.diff |   80 
++
 debian/patches/series   |6 
 debian/patches/skl-break-down-simd16-3-source-instructions.diff |   34 
 6 files changed, 229 insertions(+)

New commits:
commit cd4a127f51f5dc608f1bc07c38b5f1e0afaf20c5
Author: Timo Aaltonen tjaal...@debian.org
Date:   Fri Jul 3 15:14:25 2015 +0300

patches for SKL, release to wily

diff --git a/debian/changelog b/debian/changelog
index d7ee818..1c8cc97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (10.5.8-1ubuntu2) wily; urgency=medium
+
+  * i965-store-the-gpu-revision.diff,
+i965-refactor-simd16-to-2xsimd8-checks.diff,
+i965-define-i915-param-revision.diff,
+skl-break-down-simd16-3-source-instructions.diff:
+Fix noise in Unity, torcs et al. (LP: #1471213)
+
+ -- Timo Aaltonen tjaal...@debian.org  Fri, 03 Jul 2015 15:08:26 +0300
+
 mesa (10.5.8-1ubuntu1) wily; urgency=medium
 
   * Merge from Debian unstable.
diff --git a/debian/patches/i965-define-i915-param-revision.diff 
b/debian/patches/i965-define-i915-param-revision.diff
new file mode 100644
index 000..1d0c831
--- /dev/null
+++ b/debian/patches/i965-define-i915-param-revision.diff
@@ -0,0 +1,27 @@
+commit 484f9f4fcd53fcaa768e63934a5f74346bfb46a9
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Mar 23 09:54:52 2015 +1000
+
+i965: define I915_PARAM_REVISION
+
+we are broken against the libdrm 2.4.60 minimum specified,
+so fix it for now.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c 
b/src/mesa/drivers/dri/i965/brw_context.c
+index 0d3af2c..a39443a 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
 b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -658,6 +658,11 @@ brw_process_driconf_options(struct brw_context *brw)
+   driQueryOptionb(options, allow_glsl_extension_directive_midshader);
+ }
+ 
++/* drop when libdrm 2.4.61 is released */
++#ifndef I915_PARAM_REVISION
++#define I915_PARAM_REVISION 32
++#endif
++
+ static int
+ brw_get_revision(int fd)
+ {
diff --git a/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff 
b/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff
new file mode 100644
index 000..c595ea2
--- /dev/null
+++ b/debian/patches/i965-refactor-simd16-to-2xsimd8-checks.diff
@@ -0,0 +1,72 @@
+commit bc4b18d2977a94a6fb513bf5955236a0e92298ca
+Author: Neil Roberts n...@linux.intel.com
+Date:   Thu Mar 19 18:18:49 2015 +
+
+i965: Refactor SIMD16-to-2xSIMD8 checks.
+
+The places that were checking whether 3-source instructions are
+supported have now been combined into a small helper function. This
+will be used in the next patch to add an additonal restriction.
+
+Based on a patch by Kenneth Graunke.
+
+Reviewed-by: Kenneth Graunke kenn...@whitecape.org
+Reviewed-by: Matt Turner matts...@gmail.com
+
+diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp 
b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+index 05a2db4..6eebee1 100644
+--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
 b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+@@ -1553,6 +1553,15 @@ fs_generator::enable_debug(const char *shader_name)
+this-shader_name = shader_name;
+ }
+ 
++/**
++ * Some hardware doesn't support SIMD16 instructions with 3 sources.
++ */
++static bool
++brw_supports_simd16_3src(const struct brw_context *brw)
++{
++   return brw-is_haswell || brw-gen = 8;
++}
++
+ int
+ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
+ {
+@@ -1646,7 +1655,7 @@ fs_generator::generate_code(const cfg_t *cfg, int 
dispatch_width)
+   case BRW_OPCODE_MAD:
+  assert(brw-gen = 6);
+brw_set_default_access_mode(p, BRW_ALIGN_16);
+- if (dispatch_width == 16  brw-gen  8  !brw-is_haswell) {
++ if (dispatch_width == 16  !brw_supports_simd16_3src(brw)) {
+   brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
+ brw_inst *f = brw_MAD(p, firsthalf(dst), firsthalf(src[0]), 
firsthalf(src[1]), firsthalf(src[2]));
+   brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF);
+@@ -1667,7 +1676,7 @@ fs_generator::generate_code(const cfg_t *cfg, int 
dispatch_width)
+   case BRW_OPCODE_LRP:
+  assert(brw-gen = 6);
+brw_set_default_access_mode(p, BRW_ALIGN_16);
+- if (dispatch_width == 16  brw-gen  8  !brw-is_haswell) {
++ if (dispatch_width == 16  !brw_supports_simd16_3src(brw)) {
+   brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
+ brw_inst *f = brw_LRP(p, firsthalf(dst), firsthalf(src[0]), 
firsthalf(src[1]), 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 debian/changelog  |   12 +
 docs/relnotes/10.5.7.html |3 
 docs/relnotes/10.5.8.html |  111 ++
 src/egl/drivers/dri2/platform_x11.c   |2 
 src/egl/main/eglcontext.c |5 
 src/gallium/auxiliary/draw/draw_llvm.c|4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |   16 -
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |2 
 src/gallium/drivers/nouveau/nv50/nv50_state.c |4 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |4 
 src/gallium/targets/dri/Makefile.am   |6 
 src/loader/Makefile.am|   10 
 src/mesa/drivers/dri/Makefile.am  |1 
 src/mesa/drivers/dri/common/Android.mk|4 
 src/mesa/drivers/dri/common/Makefile.am   |6 
 src/mesa/drivers/dri/common/Makefile.sources  |4 
 src/mesa/drivers/dri/common/SConscript|2 
 src/mesa/drivers/dri/i965/Makefile.am |1 
 src/mesa/drivers/dri/i965/brw_eu_compact.c|   59 +
 src/mesa/drivers/dri/i965/brw_fs.h|3 
 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp |   17 +
 22 files changed, 241 insertions(+), 37 deletions(-)

New commits:
commit be58c5fe146c1aac7140a7e0aa9076218430655c
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Jun 25 21:37:58 2015 +0300

release to wily

diff --git a/debian/changelog b/debian/changelog
index 776d2e3..d7ee818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.5.8-1ubuntu1) wily; urgency=medium
+
+  * Merge from Debian unstable.
+
+ -- Timo Aaltonen tjaal...@debian.org  Thu, 25 Jun 2015 21:34:12 +0300
+
 mesa (10.5.8-1) unstable; urgency=medium
 
   * New upstream release.

commit 5913c7a5217df09e86f08a4122fc4e403f3bfa2c
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Jun 25 18:50:32 2015 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 48f37fa..7d9ad4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (10.5.8-1) UNRELEASED; urgency=medium
+mesa (10.5.8-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Timo Aaltonen tjaal...@debian.org  Thu, 25 Jun 2015 18:49:36 +0300
+ -- Timo Aaltonen tjaal...@debian.org  Thu, 25 Jun 2015 18:50:11 +0300
 
 mesa (10.5.7-1) unstable; urgency=medium
 

commit e301204bc62db9a1a56ee222d372df02e01843e6
Author: Timo Aaltonen tjaal...@debian.org
Date:   Thu Jun 25 18:50:09 2015 +0300

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 07feb64..48f37fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.5.8-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Timo Aaltonen tjaal...@debian.org  Thu, 25 Jun 2015 18:49:36 +0300
+
 mesa (10.5.7-1) unstable; urgency=medium
 
   * New upstream release.

commit 24b043aab73ce066ded6e4bc93f589008dfc8484
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Sat Jun 20 15:14:45 2015 +0100

Add release notes for the 10.5.8 release

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/docs/relnotes/10.5.8.html b/docs/relnotes/10.5.8.html
new file mode 100644
index 000..8c5c8ab
--- /dev/null
+++ b/docs/relnotes/10.5.8.html
@@ -0,0 +1,111 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.5.8 Release Notes / June 20, 2015/h1
+
+p
+Mesa 10.5.8 is a bug fix release which fixes bugs found since the 10.5.7 
release.
+/p
+p
+Mesa 10.5.8 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+
+h2SHA256 checksums/h2
+pre
+TBD
+/pre
+
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=90310;Bug 90310/a 
- Fails to build gallium_dri.so at linking stage with clang because of multiple 
redefinitions/li
+
+lia 

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |5 +++--
 debian/control   |1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 98951a7b984cc2fd1d37f5c69ff65871e08fc39f
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Jun 16 14:34:08 2015 +0300

release to wily

diff --git a/debian/changelog b/debian/changelog
index 1557b92..c3e54bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.5.7-1ubuntu1) UNRELEASED; urgency=medium
+mesa (10.5.7-1ubuntu1) wily; urgency=medium
 
   * Merge from Debian unstable, remaining changes
 - libclc/clang is not in main, drop building mesa-opencl-icd
@@ -13,7 +13,7 @@ mesa (10.5.7-1ubuntu1) UNRELEASED; urgency=medium
   skl-*: backports for Skylake
   * control: Add libmirclient-dev to build-depends.
 
- -- Timo Aaltonen tjaal...@debian.org  Tue, 16 Jun 2015 13:33:43 +0300
+ -- Timo Aaltonen tjaal...@debian.org  Tue, 16 Jun 2015 14:33:48 +0300
 
 mesa (10.5.7-1) unstable; urgency=medium
 

commit ccb3d6e015b51c5c6e1672b3021fc778be36b18b
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Jun 16 14:33:26 2015 +0300

control: Add libmirclient-dev to build-depends.

diff --git a/debian/changelog b/debian/changelog
index 35158f2..1557b92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ mesa (10.5.7-1ubuntu1) UNRELEASED; urgency=medium
   i915-dont-default-to-2.1.patch: revert of i915 forced OpenGL
 2.1 commit
   skl-*: backports for Skylake
+  * control: Add libmirclient-dev to build-depends.
 
  -- Timo Aaltonen tjaal...@debian.org  Tue, 16 Jun 2015 13:33:43 +0300
 
diff --git a/debian/control b/debian/control
index c7637ff..832e202 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Build-Depends:
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (= 1.2.0) [linux-any],
  mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el],
+ libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1z4pex-00088c...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 Android.common.mk  |   14 
 Makefile.am|1 
 VERSION|2 
 bin/.cherry-ignore |3 
 bin/get-pick-list.sh   |2 
 configure.ac   |   14 
 debian/changelog   |   37 ++
 debian/control |2 
 docs/relnotes/10.5.2.html  |3 
 docs/relnotes/10.5.3.html  |  125 
 docs/relnotes/10.5.4.html  |  125 
 docs/relnotes/10.5.5.html  |   95 ++
 docs/relnotes/10.5.6.html  |  147 
++
 docs/relnotes/10.5.7.html  |  102 ++
 include/pci_ids/radeonsi_pci_ids.h |1 
 src/egl/drivers/dri2/Android.mk|8 
 src/egl/drivers/dri2/egl_dri2.c|2 
 src/egl/drivers/dri2/platform_wayland.c|5 
 src/egl/main/eglapi.c  |6 
 src/gallium/auxiliary/Android.mk   |3 
 src/gallium/auxiliary/draw/draw_context.c  |1 
 src/gallium/auxiliary/draw/draw_llvm.c |2 
 src/gallium/auxiliary/draw/draw_prim_assembler.c   |   13 
 src/gallium/auxiliary/draw/draw_prim_assembler.h   |3 
 src/gallium/drivers/freedreno/Android.mk   |5 
 src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c|8 
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c   |7 
 src/gallium/drivers/freedreno/freedreno_context.h  |2 
 src/gallium/drivers/freedreno/freedreno_gmem.c |9 
 src/gallium/drivers/freedreno/freedreno_resource.c |   16 -
 src/gallium/drivers/freedreno/freedreno_screen.c   |3 
 src/gallium/drivers/nouveau/Android.mk |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp |7 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp  |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp  |6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.cpp |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp  |   25 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h|1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp   |   35 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp|5 
 src/gallium/drivers/nouveau/nouveau_buffer.c   |   48 ++-
 src/gallium/drivers/nouveau/nouveau_context.h  |8 
 src/gallium/drivers/nouveau/nv30/nv30_clear.c  |2 
 src/gallium/drivers/nouveau/nv30/nv30_context.h|2 
 src/gallium/drivers/nouveau/nv30/nv30_draw.c   |   74 +++--
 src/gallium/drivers/nouveau/nv30/nv30_fragprog.c   |5 
 src/gallium/drivers/nouveau/nv30/nv30_state_validate.c |   26 -
 src/gallium/drivers/nouveau/nv30/nv30_vbo.c|2 
 src/gallium/drivers/nouveau/nv30/nv30_vertprog.c   |5 
 src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c   |5 
 src/gallium/drivers/nouveau/nv50/nv50_context.c|   11 
 src/gallium/drivers/nouveau/nv50/nv50_context.h|   29 -
 src/gallium/drivers/nouveau/nv50/nv50_miptree.c|   14 
 src/gallium/drivers/nouveau/nv50/nv50_query.c  |   10 
 src/gallium/drivers/nouveau/nv50/nv50_resource.h   |3 
 src/gallium/drivers/nouveau/nv50/nv50_screen.h |   24 +
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_context.c|7 
 src/gallium/drivers/nouveau/nvc0/nvc0_context.h|   24 -
 src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c|6 
 src/gallium/drivers/nouveau/nvc0/nvc0_program.c|   13 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.h |   25 +
 src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c|6 
 src/gallium/drivers/r300/Android.mk|5 
 src/gallium/drivers/r300/Automake.inc  |2 
 src/gallium/drivers/r600/Android.mk|3 
 src/gallium/drivers/radeon/Android.mk   

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 VERSION   |2 
 bin/.cherry-ignore|   14 
 configure.ac  |  151 --
 debian/changelog  |   20 
 debian/libegl1-mesa.symbols   |1 
 debian/patches/egl-platform-mir.patch |   73 +--
 docs/relnotes/10.5.0.html |5 
 docs/relnotes/10.5.1.html |  217 +
 docs/relnotes/10.5.2.html |  129 +
 include/c11/threads_posix.h   |7 
 m4/ax_check_python_mako_module.m4 |6 
 src/Makefile.am   |5 
 src/egl/drivers/dri2/Makefile.am  |2 
 src/egl/drivers/dri2/platform_drm.c   |   16 
 src/egl/main/eglarray.h   |4 
 src/egl/main/eglconfig.c  |2 
 src/egl/main/eglconfig.h  |   14 
 src/egl/main/eglcontext.h |4 
 src/egl/main/eglcurrent.c |2 
 src/egl/main/eglcurrent.h |8 
 src/egl/main/egldisplay.h |   10 
 src/egl/main/egldriver.h  |6 
 src/egl/main/eglimage.h   |4 
 src/egl/main/egllog.h |6 
 src/egl/main/eglscreen.h  |4 
 src/egl/main/eglsurface.h |6 
 src/egl/main/eglsync.h|2 
 src/gallium/auxiliary/indices/u_indices_gen.py|8 
 src/gallium/auxiliary/os/os_mman.h|4 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h |4 
 src/gallium/drivers/freedreno/a2xx/ir-a2xx.c  |3 
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h |   24 -
 src/gallium/drivers/freedreno/a3xx/fd3_program.c  |5 
 src/gallium/drivers/freedreno/a4xx/a4xx.xml.h |   38 +
 src/gallium/drivers/freedreno/a4xx/fd4_draw.c |5 
 src/gallium/drivers/freedreno/a4xx/fd4_emit.c |   13 
 src/gallium/drivers/freedreno/a4xx/fd4_emit.h |1 
 src/gallium/drivers/freedreno/a4xx/fd4_gmem.c |9 
 src/gallium/drivers/freedreno/a4xx/fd4_program.c  |   42 -
 src/gallium/drivers/freedreno/a4xx/fd4_texture.c  |   10 
 src/gallium/drivers/freedreno/adreno_common.xml.h |4 
 src/gallium/drivers/freedreno/adreno_pm4.xml.h|4 
 src/gallium/drivers/freedreno/freedreno_resource.c|   11 
 src/gallium/drivers/freedreno/freedreno_state.c   |4 
 src/gallium/drivers/freedreno/ir3/disasm-a3xx.c   |  157 +++---
 src/gallium/drivers/freedreno/ir3/instr-a3xx.h|   41 -
 src/gallium/drivers/freedreno/ir3/ir3.c   |   64 +-
 src/gallium/drivers/freedreno/ir3/ir3.h   |   11 
 src/gallium/drivers/freedreno/ir3/ir3_compiler.c  |  113 -
 src/gallium/drivers/freedreno/ir3/ir3_depth.c |2 
 src/gallium/drivers/freedreno/ir3/ir3_group.c |   71 +--
 src/gallium/drivers/freedreno/ir3/ir3_legalize.c  |   40 +
 src/gallium/drivers/freedreno/ir3/ir3_shader.c|1 
 src/gallium/drivers/freedreno/ir3/ir3_shader.h|4 
 src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c |   11 
 src/gallium/drivers/r300/r300_blit.c  |9 
 src/gallium/drivers/r300/r300_fs.c|   18 
 src/gallium/drivers/r300/r300_texture.c   |   36 -
 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c   |2 
 src/gallium/drivers/radeonsi/si_shader.c  |2 
 src/gallium/state_trackers/clover/core/kernel.hpp |2 
 src/gallium/state_trackers/egl/Makefile.sources   |1 
 src/gallium/state_trackers/egl/SConscript |3 
 src/gallium/state_trackers/egl/x11/dri2.c |1 
 src/glsl/ast_to_hir.cpp   |6 
 src/glsl/linker.cpp   |   15 
 src/glsl/lower_const_arrays_to_uniforms.cpp   |4 
 src/glsl/opt_algebraic.cpp|   15 
 src/glx/glxext.c  |9 
 src/loader/loader.c   |2 
 src/mapi/Makefile.am  |2 
 src/mapi/stub.c   |2 
 src/mesa/drivers/common/meta_tex_subimage.c   |  110 ++--
 src/mesa/drivers/dri/i915/intel_fbo.c 

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 VERSION   |2 
 debian/changelog  |   23 +-
 debian/patches/series |1 
 debian/patches/skl-implement-wadisable1ddepthstencil.diff |   38 ---
 docs/relnotes/10.5.0.html |  147 +-
 src/gallium/auxiliary/os/os_misc.c|4 
 src/gallium/drivers/r600/sb/sb_sched.cpp  |4 
 src/gallium/state_trackers/omx/vid_dec_h264.c |5 
 src/gallium/targets/pipe-loader/Makefile.am   |6 
 src/glsl/opt_algebraic.cpp|   75 ---
 src/glx/dri_common_query_renderer.c   |   36 ++-
 src/mapi/Makefile.am  |2 
 src/mesa/Android.gen.mk   |2 
 src/mesa/Makefile.am  |8 
 src/mesa/Makefile.sources |2 
 src/mesa/SConscript   |2 
 src/mesa/drivers/common/meta_tex_subimage.c   |   89 +---
 src/mesa/drivers/dri/common/xmlpool/Makefile.am   |2 
 src/mesa/drivers/dri/i965/gen8_depth_state.c  |   12 +
 src/mesa/main/.gitignore  |4 
 src/mesa/main/formats.c   |2 
 21 files changed, 333 insertions(+), 133 deletions(-)

New commits:
commit 56568ba9bc92a35f8c8f0a026c8300dc4fe68fc5
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Mon Mar 9 14:10:08 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 446711c..1c2453c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (10.5.0-0ubuntu1) UNRELEASED; urgency=medium
+mesa (10.5.0-0ubuntu1) vivid; urgency=medium
 
   * Merge with unreleased debian-experimental.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 16 Feb 2015 
09:35:43 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 09 Mar 2015 
14:10:00 +0100
 
 mesa (10.5.0-1) UNRELEASED; urgency=medium
 

commit 8cd55cbb089bea567a1ed81a5c5f265ba7da1233
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Mon Mar 9 13:56:52 2015 +0100

bump changelog

diff --git a/debian/changelog b/debian/changelog
index b051ca5..446711c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.5.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with unreleased debian-experimental.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 16 Feb 2015 
09:35:43 +0100
+
 mesa (10.5.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.

commit 7b142029bf6af89fe647f2f127e4ede3e6fb0c86
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Mon Mar 9 13:56:10 2015 +0100

bump version

diff --git a/debian/changelog b/debian/changelog
index 29c297a..36d61ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.5.0~rc3-1) UNRELEASED; urgency=medium
+mesa (10.5.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update watch file.

commit 97357d475fc8cbb5dbe7bf17ca41f535827fb253
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Fri Mar 6 22:55:59 2015 +

docs: Update 10.5.0 release notes

Signed-off-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/docs/relnotes/10.5.0.html b/docs/relnotes/10.5.0.html
index 578db4f..cde8f3d 100644
--- a/docs/relnotes/10.5.0.html
+++ b/docs/relnotes/10.5.0.html
@@ -14,7 +14,7 @@
 iframe src=../contents.html/iframe
 div class=content
 
-h1Mesa 10.5.0 Release Notes / TBD/h1
+h1Mesa 10.5.0 Release Notes / March 06, 2015/h1
 
 p
 Mesa 10.5.0 is a new development release.
@@ -55,7 +55,150 @@ Note: some of the new features are only available with 
certain drivers.
 
 h2Bug fixes/h2
 
-TBD.
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=10370;Bug 10370/a 
- Incorrect pixels read back if draw bitmap texture through Display list/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=45348;Bug 45348/a 
- [swrast] piglit fbo-drawbuffers-arbfp regression/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=60879;Bug 60879/a 
- [radeonsi] X11 can't start with acceleration enabled/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=67672;Bug 67672/a 
- [llvmpipe] lp_test_arit fails on old CPUs/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=77544;Bug 77544/a 
- i965: Try to use LINE instructions to perform MAD with immediate 
arguments/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=78770;Bug 78770/a 
- [SNB bisected]Webglc conformance/textures/texture-size-limit.html fails/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=80568;Bug 80568/a 
- [gen4] GPU Crash During Google Chrome Operation/li
+
+lia 

mesa: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 debian/control   |   13 +++--
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit c3ceacaa6d2e40a722885f0ef5eb703cc2f84a68
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Tue Mar 10 15:21:53 2015 +0100

Allow unrenamed -dev packages to work with the renamed stack. (LP: #1424466)

diff --git a/debian/changelog b/debian/changelog
index da7c98a..b36bf14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.3-0ubuntu0.4) trusty; urgency=medium
+
+  * Allow unrenamed -dev packages to work with the renamed stack. (LP: 
#1424466)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 10 Mar 2015 
12:04:39 +0100
+
 mesa (10.1.3-0ubuntu0.3) trusty; urgency=medium
 
   * Backport Braswell support (LP: #1404217)
diff --git a/debian/control b/debian/control
index 8c9f685..d18bfcc 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Package: libxatracker-dev
 Section: libdevel
 Architecture: linux-any
 Depends:
- libxatracker2 (= ${binary:Version}),
+ libxatracker2 (= ${binary:Version}) | libxatracker2-lts-utopic | 
libxatracker2-lts-vivid,
  ${misc:Depends},
 Description: X acceleration library -- development files
  This package contains the XA (X acceleration) library.  It is used exclusively
@@ -182,8 +182,9 @@ Package: libegl1-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libegl1-mesa (= ${binary:Version}),
- libegl1-mesa-drivers (= ${binary:Version}) [!hurd-any],
+ libegl1-mesa (= ${binary:Version}) | libegl1-mesa-lts-utopic | 
libegl1-mesa-lts-vivid,
+# Vivid and higher only have libegl1-mesa-drivers as a transitional package.
+ libegl1-mesa-drivers (= ${binary:Version}) [!hurd-any] | 
libegl1-mesa-drivers-lts-utopic | libwayland-egl1-mesa-lts-vivid,
  libdrm-dev (= 2.4.52) [!hurd-any],
  x11proto-dri2-dev (= 2.6),
  x11proto-gl-dev (= 1.4.14),
@@ -370,7 +371,7 @@ Package: libgles1-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libgles1-mesa (= ${binary:Version}),
+ libgles1-mesa (= ${binary:Version}) | libgles1-mesa-lts-utopic | 
libgles1-mesa-lts-vivid,
  libegl1-mesa-dev,
  ${misc:Depends},
 Description: free implementation of the OpenGL|ES 1.x API -- development files
@@ -428,7 +429,7 @@ Package: libgles2-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libgles2-mesa (= ${binary:Version}),
+ libgles2-mesa (= ${binary:Version}) | libgles2-mesa-lts-utopic | 
libgles2-mesa-lts-vivid,
  libegl1-mesa-dev,
  ${misc:Depends},
 Description: free implementation of the OpenGL|ES 2.x API -- development files
@@ -606,7 +607,7 @@ Section: libdevel
 Architecture: any
 Depends:
  mesa-common-dev (= ${binary:Version}),
- libgl1-mesa-glx (= ${binary:Version}),
+ libgl1-mesa-glx (= ${binary:Version}) | libgl1-mesa-glx-lts-utopic | 
libgl1-mesa-glx-lts-vivid,
  libdrm-dev (= 2.4.52) [!hurd-any],
  libx11-dev,
  libx11-xcb-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yvl2q-00077i...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |9 +
 debian/patches/series |3 
 debian/patches/skl-implement-wadisable1ddepthstencil.diff |   38 
 debian/patches/skl-use-1-register-for-uniform-pull.diff   |   35 +++
 debian/patches/skl-use-vec4-datatypes-for-message-header.diff |   47 ++
 5 files changed, 132 insertions(+)

New commits:
commit 17d6ea29000d4bf1899a9f95d8f8b5e4efd1560e
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Feb 24 14:33:13 2015 +0200

Add a couple of backported fixes for Skylake

skl-use-1-register-for-uniform-pull.diff
skl-use-vec4-datatypes-for-message-header.diff
skl-implement-wadisable1ddepthstencil.diff

diff --git a/debian/changelog b/debian/changelog
index f51097a..4443960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (10.5.0~rc1-0ubuntu2) vivid; urgency=medium
+
+  * Add a couple of backported fixes for Skylake:
+skl-use-1-register-for-uniform-pull.diff
+skl-use-vec4-datatypes-for-message-header.diff
+skl-implement-wadisable1ddepthstencil.diff
+
+ -- Timo Aaltonen tjaal...@debian.org  Fri, 20 Feb 2015 08:54:44 +0200
+
 mesa (10.5.0~rc1-0ubuntu1) vivid; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/patches/series b/debian/patches/series
index af4c631..21442ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,6 @@
 # Ubuntu patches.
 egl-platform-mir.patch
 i915-dont-default-to-2.1.patch
+skl-use-1-register-for-uniform-pull.diff
+skl-use-vec4-datatypes-for-message-header.diff
+skl-implement-wadisable1ddepthstencil.diff
diff --git a/debian/patches/skl-implement-wadisable1ddepthstencil.diff 
b/debian/patches/skl-implement-wadisable1ddepthstencil.diff
new file mode 100644
index 000..13e6534
--- /dev/null
+++ b/debian/patches/skl-implement-wadisable1ddepthstencil.diff
@@ -0,0 +1,38 @@
+commit 5b29b2922afe2b8167a589fc2896a071fc85b693
+Author: Neil Roberts n...@linux.intel.com
+Date:   Mon Feb 2 17:47:23 2015 +
+
+i965/skl: Implement WaDisable1DDepthStencil
+
+Skylake+ doesn't support setting a depth buffer to a 1D surface but it
+does allow pretending it's a 2D texture with a height of 1 instead.
+
+This fixes the GL_DEPTH_COMPONENT_* tests of the copyteximage piglit
+test (and also seems to avoid a subsequent GPU hang).
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89037
+Reviewed-by: Kenneth Graunke kenn...@whitecape.org
+
+diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c 
b/src/mesa/drivers/dri/i965/gen8_depth_state.c
+index e428089..b4eb6e1 100644
+--- a/src/mesa/drivers/dri/i965/gen8_depth_state.c
 b/src/mesa/drivers/dri/i965/gen8_depth_state.c
+@@ -190,6 +190,18 @@ gen8_emit_depth_stencil_hiz(struct brw_context *brw,
+case GL_TEXTURE_3D:
+   assert(mt);
+   depth = MAX2(mt-logical_depth0, 1);
++  surftype = translate_tex_target(gl_target);
++  break;
++   case GL_TEXTURE_1D_ARRAY:
++   case GL_TEXTURE_1D:
++  if (brw-gen = 9) {
++ /* WaDisable1DDepthStencil. Skylake+ doesn't support 1D depth
++  * textures but it does allow pretending it's a 2D texture
++  * instead.
++  */
++ surftype = BRW_SURFACE_2D;
++ break;
++  }
+   /* fallthrough */
+default:
+   surftype = translate_tex_target(gl_target);
diff --git a/debian/patches/skl-use-1-register-for-uniform-pull.diff 
b/debian/patches/skl-use-1-register-for-uniform-pull.diff
new file mode 100644
index 000..a89cbc4
--- /dev/null
+++ b/debian/patches/skl-use-1-register-for-uniform-pull.diff
@@ -0,0 +1,35 @@
+From 5255e1a9e6599942b10724fe5e573979f123b7e0 Mon Sep 17 00:00:00 2001
+From: Ben Widawsky benjamin.widaw...@intel.com
+Date: Thu, 19 Feb 2015 15:49:34 -0800
+Subject: [PATCH] i965/skl: Use 1 register for uniform pull constant payload
+
+When under dispatch_width=16 the previous code would allocate 2 registers for
+the payload when only one is needed. This manifested itself through bugs on SKL
+which needs to mess with this instruction.
+
+Ken says this might have some positive impact on shader-db.
+
+Cc: Kenneth Graunke kenn...@whitecape.org
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89118
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88999
+Signed-off-by: Ben Widawsky b...@bwidawsk.net
+---
+ src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp 
b/src/mesa/drivers/dri/i965/brw_fs.cpp
+index a562b8a..bb647bd 100644
+--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
 b/src/mesa/drivers/dri/i965/brw_fs.cpp
+@@ -3062,7 +3062,7 @@ fs_visitor::lower_uniform_pull_constant_loads()
+  assert(const_offset_reg.file == IMM 
+ const_offset_reg.type == BRW_REGISTER_TYPE_UD);
+  const_offset_reg.fixed_hw_reg.dw1.ud /= 4;
+- fs_reg 

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 .dir-locals.el |2 
 .gitignore |1 
 Makefile.am|  113 
 VERSION|2 
 bin/.cherry-ignore |2 
 configure.ac   |  257 
 debian/README.source   |2 
 debian/changelog   |   17 
 debian/control |1 
 debian/patches/egl-platform-mir.patch  |   80 
 debian/patches/i915-fix-gen4-hangs.patch   |   59 
 debian/patches/llvm-3.6-fixes.patch|  616 -
 debian/patches/series  |2 
 debian/rules   |2 
 debian/source/local-options|1 
 debian/watch   |2 
 docs/GL3.txt   |   15 
 docs/index.html|   44 
 docs/install.html  |6 
 docs/relnotes.html |8 
 docs/relnotes/10.3.4.html  |  106 
 docs/relnotes/10.3.5.html  |   88 
 docs/relnotes/10.3.6.html  |  124 
 docs/relnotes/10.3.7.html  |   93 
 docs/relnotes/10.4.2.html  |4 
 docs/relnotes/10.4.3.html  |  145 
 docs/relnotes/10.4.4.html  |  100 
 docs/relnotes/10.5.0.html  |   68 
 include/D3D9/d3d9.h|   10 
 include/D3D9/d3d9types.h   |   18 
 include/EGL/eglplatform.h  |   10 
 include/GL/glext.h |  266 
 include/GL/internal/dri_interface.h|1 
 include/c99/stdbool.h  |3 
 include/c99_compat.h   |6 
 include/pci_ids/i965_pci_ids.h |   15 
 install-lib-links.mk   |6 
 m4/ax_check_python_mako_module.m4  |   61 
 m4/ax_prog_flex.m4 |4 
 scons/gallium.py   |   12 
 scons/llvm.py  |   16 
 src/Makefile.am|   21 
 src/SConscript |5 
 src/egl/drivers/dri2/Makefile.am   |3 
 src/egl/drivers/dri2/SConscript|   40 
 src/egl/drivers/dri2/egl_dri2.c|   51 
 src/egl/drivers/dri2/egl_dri2.h|3 
 src/egl/drivers/dri2/platform_android.c|2 
 src/egl/drivers/dri2/platform_drm.c|2 
 src/egl/drivers/dri2/platform_wayland.c|   17 
 src/egl/drivers/dri2/platform_x11.c|   27 
 src/egl/drivers/haiku/SConscript   |   34 
 src/egl/drivers/haiku/egl_haiku.cpp|  436 
 src/egl/main/Makefile.am   |5 
 src/egl/main/SConscript|   16 
 src/egl/main/eglapi.c  |   19 
 src/egl/main/egldisplay.c  |7 
 src/egl/main/egldisplay.h  |2 
 src/egl/main/egldriver.c   |6 
 src/egl/main/eglglobals.c  |4 
 src/egl/main/eglglobals.h  |1 
 src/egl/main/eglmisc.c |1 
 src/egl/wayland/Makefile.am|1 
 src/egl/wayland/wayland-egl/Makefile.am|1 
 src/egl/wayland/wayland-egl/wayland-egl-priv.h |2 
 src/gallium/Automake.inc   |2 
 src/gallium/Makefile.am|9 
 src/gallium/SConscript |2 
 src/gallium/auxiliary/Android.mk   |4 
 

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 .dir-locals.el |2 
 .gitignore |1 
 Makefile.am|  113 
 VERSION|2 
 bin/.cherry-ignore |2 
 configure.ac   |  257 
 debian/README.source   |2 
 debian/changelog   |   17 
 debian/control |1 
 debian/patches/egl-platform-mir.patch  |   80 
 debian/patches/i915-fix-gen4-hangs.patch   |   59 
 debian/patches/llvm-3.6-fixes.patch|  616 -
 debian/patches/series  |2 
 debian/rules   |2 
 debian/source/local-options|1 
 debian/watch   |2 
 docs/GL3.txt   |   15 
 docs/index.html|   44 
 docs/install.html  |6 
 docs/relnotes.html |8 
 docs/relnotes/10.3.4.html  |  106 
 docs/relnotes/10.3.5.html  |   88 
 docs/relnotes/10.3.6.html  |  124 
 docs/relnotes/10.3.7.html  |   93 
 docs/relnotes/10.4.2.html  |4 
 docs/relnotes/10.4.3.html  |  145 
 docs/relnotes/10.4.4.html  |  100 
 docs/relnotes/10.5.0.html  |   68 
 include/D3D9/d3d9.h|   10 
 include/D3D9/d3d9types.h   |   18 
 include/EGL/eglplatform.h  |   10 
 include/GL/glext.h |  266 
 include/GL/internal/dri_interface.h|1 
 include/c99/stdbool.h  |3 
 include/c99_compat.h   |6 
 include/pci_ids/i965_pci_ids.h |   15 
 install-lib-links.mk   |6 
 m4/ax_check_python_mako_module.m4  |   61 
 m4/ax_prog_flex.m4 |4 
 scons/gallium.py   |   12 
 scons/llvm.py  |   16 
 src/Makefile.am|   21 
 src/SConscript |5 
 src/egl/drivers/dri2/Makefile.am   |3 
 src/egl/drivers/dri2/SConscript|   40 
 src/egl/drivers/dri2/egl_dri2.c|   51 
 src/egl/drivers/dri2/egl_dri2.h|3 
 src/egl/drivers/dri2/platform_android.c|2 
 src/egl/drivers/dri2/platform_drm.c|2 
 src/egl/drivers/dri2/platform_wayland.c|   17 
 src/egl/drivers/dri2/platform_x11.c|   27 
 src/egl/drivers/haiku/SConscript   |   34 
 src/egl/drivers/haiku/egl_haiku.cpp|  436 
 src/egl/main/Makefile.am   |5 
 src/egl/main/SConscript|   16 
 src/egl/main/eglapi.c  |   19 
 src/egl/main/egldisplay.c  |7 
 src/egl/main/egldisplay.h  |2 
 src/egl/main/egldriver.c   |6 
 src/egl/main/eglglobals.c  |4 
 src/egl/main/eglglobals.h  |1 
 src/egl/main/eglmisc.c |1 
 src/egl/wayland/Makefile.am|1 
 src/egl/wayland/wayland-egl/Makefile.am|1 
 src/egl/wayland/wayland-egl/wayland-egl-priv.h |2 
 src/gallium/Automake.inc   |2 
 src/gallium/Makefile.am|9 
 src/gallium/SConscript |2 
 src/gallium/auxiliary/Android.mk   |4 
 

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e168391ccade5a938869654b069565739fc419cb
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Thu Feb 19 12:00:56 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index c8a78ef..f51097a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.5.0~rc1-0ubuntu1) UNRELEASED; urgency=medium
+mesa (10.5.0~rc1-0ubuntu1) vivid; urgency=medium
 
   [ Timo Aaltonen ]
   * Update Mir patch.
@@ -6,7 +6,7 @@ mesa (10.5.0~rc1-0ubuntu1) UNRELEASED; urgency=medium
   [ Maarten Lankhorst ]
   * Merge from unreleased debian-experimental.
 
- -- Timo Aaltonen tjaal...@debian.org  Tue, 13 Jan 2015 15:56:02 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 19 Feb 2015 
11:28:53 +0100
 
 mesa (10.5.0~rc1-1) UNRELEASED; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yooqp-00072k...@moszumanska.debian.org

mesa: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 debian/changelog  |   18 +
 debian/control|2 -
 debian/patches/egl-platform-mir.patch |   45 +++---
 3 files changed, 56 insertions(+), 9 deletions(-)

New commits:
commit 443e9a1eda33596f6b6ae314a1e928ea4822aeef
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Feb 11 09:22:34 2015 +0100

Fix ftbfs from no longer including libmirclient-dev.

diff --git a/debian/changelog b/debian/changelog
index 2517127..94916c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.4.2-2ubuntu5) vivid; urgency=medium
+
+  * Fix ftbfs from no longer including libmirclient-dev.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 11 Feb 2015 
09:21:54 +0100
+
 mesa (10.4.2-2ubuntu4) vivid; urgency=medium
 
   * debian/control:
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index f56c7fc..6e1765b 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -104,12 +104,11 @@
free(dri2_dpy-driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
-@@ -64,6 +64,11 @@
+@@ -64,6 +64,10 @@
  
  #endif /* HAVE_ANDROID_PLATFORM */
  
 +#ifdef HAVE_MIR_PLATFORM
-+#include mir_toolkit/mir_client_library.h
 +#include mir_toolkit/mesa/native_display.h
 +#endif
 +

commit ea665e5bd3aeb2ffe2d0c461688792d51065de24
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Tue Feb 10 16:28:54 2015 +0100

bump mir patch some more

diff --git a/debian/changelog b/debian/changelog
index 727b862..2517127 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mesa (10.4.2-2ubuntu4) vivid; urgency=medium
+
+  * debian/control:
+- Change build-dep for mir to mir-client-platform-mesa-dev.
+  * debian/patches/egl-platform-mir.patch:
+- Fix potential double free (LP: #1414999).
+- Fix gbm_device leak (LP: #1419704).
+- Fix dri_buffers[front/back] leak (LP: #1419710).
+- Use mir-client-platform-mesa-dev to get Mir build flags.
+
+ -- Alexandros Frantzis alexandros.frant...@canonical.com  Mon, 09 Feb 2015 
12:35:56 +0200
+
 mesa (10.4.2-2ubuntu3) vivid; urgency=medium
 
   * egl-platform-mir.patch: Fix memory leak. (LP:#1418486)
diff --git a/debian/control b/debian/control
index 4c60ceb..46bad7a 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
  llvm-3.6-dev (= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (= 1.2.0) [linux-any],
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
+ mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index f6ec7b6..f56c7fc 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -6,7 +6,7 @@
;;
 -
 +mir)
-+PKG_CHECK_MODULES([MIR], [mirclient])
++PKG_CHECK_MODULES([MIR], [mir-client-platform-mesa-dev])
 +;;
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
@@ -78,6 +78,30 @@
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
if (disp-Options.TestOnly)
+@@ -699,6 +705,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+   }
+   break;
+ #endif
++#ifdef HAVE_MIR_PLATFORM
++   case _EGL_PLATFORM_MIR:
++  if (dri2_dpy-own_device) {
++ gbm_device_destroy(dri2_dpy-gbm_dri-base.base);
++  }
++  break;
++#endif
+ #ifdef HAVE_WAYLAND_PLATFORM
+case _EGL_PLATFORM_WAYLAND:
+   wl_drm_destroy(dri2_dpy-wl_drm);
+@@ -715,7 +728,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+ * the ones from the gbm device. As such the gbm itself is responsible
+ * for the cleanup.
+ */
+-   if (disp-Platform != _EGL_PLATFORM_DRM) {
++   if (disp-Platform != _EGL_PLATFORM_DRM 
++   disp-Platform != _EGL_PLATFORM_MIR) {
+   for (i = 0; dri2_dpy-driver_configs[i]; i++)
+  free((__DRIconfig *) dri2_dpy-driver_configs[i]);
+   free(dri2_dpy-driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
 @@ -64,6 +64,11 @@
@@ -148,7 +172,7 @@
  #endif /* EGL_DRI2_INCLUDED */
 --- /dev/null
 +++ b/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,613 @@
+@@ -0,0 +1,619 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -174,6 +198,7 @@
 + *
 + * Authors:
 + *Christopher James Halse Rogers christopher.halse.rog...@canonical.com
++ *Alexandros Frantzis alexandros.frant...@canonical.com
 + */
 +
 +#include mir_toolkit/mesa/native_display.h
@@ -567,10 +592,15 @@
 +   

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog  |6 ++
 debian/patches/egl-platform-mir.patch |3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 443e9a1eda33596f6b6ae314a1e928ea4822aeef
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Feb 11 09:22:34 2015 +0100

Fix ftbfs from no longer including libmirclient-dev.

diff --git a/debian/changelog b/debian/changelog
index 2517127..94916c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.4.2-2ubuntu5) vivid; urgency=medium
+
+  * Fix ftbfs from no longer including libmirclient-dev.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 11 Feb 2015 
09:21:54 +0100
+
 mesa (10.4.2-2ubuntu4) vivid; urgency=medium
 
   * debian/control:
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index f56c7fc..6e1765b 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -104,12 +104,11 @@
free(dri2_dpy-driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
-@@ -64,6 +64,11 @@
+@@ -64,6 +64,10 @@
  
  #endif /* HAVE_ANDROID_PLATFORM */
  
 +#ifdef HAVE_MIR_PLATFORM
-+#include mir_toolkit/mir_client_library.h
 +#include mir_toolkit/mesa/native_display.h
 +#endif
 +


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ylssp-0007rr...@moszumanska.debian.org

mesa: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 .dir-locals.el |2 
 debian/changelog   |   38 
 debian/control |   40 
 debian/mesa-opencl-icd.install.in  |3 
 debian/patches/egl-platform-mir.patch  |  250 +++--
 debian/rules   |   10 
 docs/GL3.txt   |   11 
 docs/index.html|8 
 docs/relnotes.html |1 
 docs/relnotes/10.4.4.html  |  100 ++
 docs/relnotes/10.5.0.html  |1 
 include/D3D9/d3d9types.h   |5 
 include/GL/glext.h |   57 -
 scons/llvm.py  |   16 
 src/egl/drivers/dri2/platform_x11.c|   24 
 src/gallium/auxiliary/Makefile.sources |1 
 src/gallium/auxiliary/draw/draw_llvm.c |2 
 src/gallium/auxiliary/draw/draw_llvm.h |2 
 src/gallium/auxiliary/gallivm/lp_bld_init.c|2 
 src/gallium/auxiliary/hud/font.c   |   24 
 src/gallium/auxiliary/hud/hud_context.c|1 
 src/gallium/auxiliary/postprocess/pp_mlaa.c|3 
 src/gallium/auxiliary/target-helpers/inline_debug_helper.h |4 
 src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h   |4 
 src/gallium/auxiliary/tgsi/tgsi_parse.c|   12 
 src/gallium/auxiliary/tgsi/tgsi_parse.h|2 
 src/gallium/auxiliary/tgsi/tgsi_ureg.c |   28 
 src/gallium/auxiliary/tgsi/tgsi_ureg.h |   25 
 src/gallium/auxiliary/util/u_cache.c   |2 
 src/gallium/auxiliary/util/u_math.h|   14 
 src/gallium/auxiliary/util/u_pstipple.c|   25 
 src/gallium/auxiliary/util/u_pstipple.h|3 
 src/gallium/auxiliary/util/u_simple_list.h |  199 
 src/gallium/auxiliary/util/u_simple_shaders.c  |   12 
 src/gallium/auxiliary/util/u_slab.c|2 
 src/gallium/auxiliary/util/u_tests.c   |  301 +-
 src/gallium/auxiliary/util/u_tests.h   |4 
 src/gallium/docs/source/screen.rst |5 
 src/gallium/docs/source/tgsi.rst   |   18 
 src/gallium/drivers/freedreno/.dir-locals.el   |2 
 src/gallium/drivers/freedreno/freedreno_screen.c   |2 
 src/gallium/drivers/i915/i915_screen.c |2 
 src/gallium/drivers/ilo/ilo_screen.c   |3 
 src/gallium/drivers/llvmpipe/lp_context.c  |2 
 src/gallium/drivers/llvmpipe/lp_scene.c|2 
 src/gallium/drivers/llvmpipe/lp_screen.c   |7 
 src/gallium/drivers/llvmpipe/lp_state_fs.c |2 
 src/gallium/drivers/llvmpipe/lp_state_setup.c  |2 
 src/gallium/drivers/llvmpipe/lp_texture.c  |2 
 src/gallium/drivers/nouveau/nv30/nv30_screen.c |2 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c |2 
 src/gallium/drivers/r300/r300_context.c|2 
 src/gallium/drivers/r300/r300_flush.c  |2 
 src/gallium/drivers/r300/r300_query.c  |2 
 src/gallium/drivers/r300/r300_reg.h|   22 
 src/gallium/drivers/r300/r300_screen.c |8 
 src/gallium/drivers/r300/r300_state.c  |1 
 src/gallium/drivers/r300/r300_state_inlines.h  |1 
 src/gallium/drivers/r600/.dir-locals.el|2 
 src/gallium/drivers/r600/r600_asm.c|6 
 src/gallium/drivers/r600/r600_pipe.c   |3 
 src/gallium/drivers/r600/r600_shader.c |   63 +
 src/gallium/drivers/r600/r700_asm.c|1 
 src/gallium/drivers/r600/sb/sb_expr.cpp|2 
 src/gallium/drivers/radeon/.dir-locals.el  |2 
 src/gallium/drivers/radeon/r600_pipe_common.c  |   11 
 src/gallium/drivers/radeon/r600_pipe_common.h  |1 
 src/gallium/drivers/radeon/r600_streamout.c|4 
 src/gallium/drivers/radeonsi/.dir-locals.el|2 
 src/gallium/drivers/radeonsi/si_compute.c  |  117 +-
 src/gallium/drivers/radeonsi/si_descriptors.c  |  111 +-
 src/gallium/drivers/radeonsi/si_hw_context.c   |1 
 

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog  |   12 +
 debian/control|2 -
 debian/patches/egl-platform-mir.patch |   42 +-
 3 files changed, 49 insertions(+), 7 deletions(-)

New commits:
commit ea665e5bd3aeb2ffe2d0c461688792d51065de24
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Tue Feb 10 16:28:54 2015 +0100

bump mir patch some more

diff --git a/debian/changelog b/debian/changelog
index 727b862..2517127 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mesa (10.4.2-2ubuntu4) vivid; urgency=medium
+
+  * debian/control:
+- Change build-dep for mir to mir-client-platform-mesa-dev.
+  * debian/patches/egl-platform-mir.patch:
+- Fix potential double free (LP: #1414999).
+- Fix gbm_device leak (LP: #1419704).
+- Fix dri_buffers[front/back] leak (LP: #1419710).
+- Use mir-client-platform-mesa-dev to get Mir build flags.
+
+ -- Alexandros Frantzis alexandros.frant...@canonical.com  Mon, 09 Feb 2015 
12:35:56 +0200
+
 mesa (10.4.2-2ubuntu3) vivid; urgency=medium
 
   * egl-platform-mir.patch: Fix memory leak. (LP:#1418486)
diff --git a/debian/control b/debian/control
index 4c60ceb..46bad7a 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
  llvm-3.6-dev (= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (= 1.2.0) [linux-any],
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
+ mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index f6ec7b6..f56c7fc 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -6,7 +6,7 @@
;;
 -
 +mir)
-+PKG_CHECK_MODULES([MIR], [mirclient])
++PKG_CHECK_MODULES([MIR], [mir-client-platform-mesa-dev])
 +;;
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
@@ -78,6 +78,30 @@
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
if (disp-Options.TestOnly)
+@@ -699,6 +705,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+   }
+   break;
+ #endif
++#ifdef HAVE_MIR_PLATFORM
++   case _EGL_PLATFORM_MIR:
++  if (dri2_dpy-own_device) {
++ gbm_device_destroy(dri2_dpy-gbm_dri-base.base);
++  }
++  break;
++#endif
+ #ifdef HAVE_WAYLAND_PLATFORM
+case _EGL_PLATFORM_WAYLAND:
+   wl_drm_destroy(dri2_dpy-wl_drm);
+@@ -715,7 +728,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+ * the ones from the gbm device. As such the gbm itself is responsible
+ * for the cleanup.
+ */
+-   if (disp-Platform != _EGL_PLATFORM_DRM) {
++   if (disp-Platform != _EGL_PLATFORM_DRM 
++   disp-Platform != _EGL_PLATFORM_MIR) {
+   for (i = 0; dri2_dpy-driver_configs[i]; i++)
+  free((__DRIconfig *) dri2_dpy-driver_configs[i]);
+   free(dri2_dpy-driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
 @@ -64,6 +64,11 @@
@@ -148,7 +172,7 @@
  #endif /* EGL_DRI2_INCLUDED */
 --- /dev/null
 +++ b/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,613 @@
+@@ -0,0 +1,619 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -174,6 +198,7 @@
 + *
 + * Authors:
 + *Christopher James Halse Rogers christopher.halse.rog...@canonical.com
++ *Alexandros Frantzis alexandros.frant...@canonical.com
 + */
 +
 +#include mir_toolkit/mesa/native_display.h
@@ -567,10 +592,15 @@
 +   (*dri2_dpy-core-destroyDrawable)(dri2_surf-dri_drawable);
 +
 +   for (i = 0; i  __DRI_BUFFER_COUNT; ++i) {
-+  if (dri2_surf-dri_buffers[i]  !((i == __DRI_BUFFER_FRONT_LEFT) ||
-+ (i == __DRI_BUFFER_BACK_LEFT))) {
-+ dri2_dpy-dri2-releaseBuffer(dri2_dpy-dri_screen,
-+   dri2_surf-dri_buffers[i]);
++  if (dri2_surf-dri_buffers[i]) {
++ if ((i == __DRI_BUFFER_FRONT_LEFT) ||
++ (i == __DRI_BUFFER_BACK_LEFT)) {
++free(dri2_surf-dri_buffers[i]);
++ }
++ else {
++dri2_dpy-dri2-releaseBuffer(dri2_dpy-dri_screen,
++  dri2_surf-dri_buffers[i]);
++ }
 +  }
 +   }
 +


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ylcqm-0001ew...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 804523bd206f36913a2c4802904d210718c2b389
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Thu Jan 29 13:27:20 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index d5e6530..1b0497b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.4.2-2ubuntu2) UNRELEASED; urgency=medium
+mesa (10.4.2-2ubuntu2) vivid; urgency=medium
 
   * Flip the switch to llvm 3.6 with patches backported from upstream.
   * Add upstream workaround for hangs on gen4.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 28 Jan 2015 
14:08:49 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 29 Jan 2015 
13:27:10 +0100
 
 mesa (10.4.2-2ubuntu1) vivid; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ygpwa-0007ol...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |7 
 debian/control   |2 
 debian/patches/i915-fix-gen4-hangs.patch |   59 ++
 debian/patches/llvm-3.6-fixes.patch  |  616 +++
 debian/patches/series|2 
 debian/rules |2 
 6 files changed, 686 insertions(+), 2 deletions(-)

New commits:
commit 710c202ec80cae4bb9fb49ab506739586aba0ca7
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Jan 28 16:50:29 2015 +0100

Add upstream workaround for hangs on gen4.

diff --git a/debian/changelog b/debian/changelog
index da98ae7..d5e6530 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (10.4.2-2ubuntu2) UNRELEASED; urgency=medium
 
   * Flip the switch to llvm 3.6 with patches backported from upstream.
+  * Add upstream workaround for hangs on gen4.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 28 Jan 2015 
14:08:49 +0100
 
diff --git a/debian/patches/i915-fix-gen4-hangs.patch 
b/debian/patches/i915-fix-gen4-hangs.patch
new file mode 100644
index 000..34e8a5c
--- /dev/null
+++ b/debian/patches/i915-fix-gen4-hangs.patch
@@ -0,0 +1,59 @@
+commit 882f702441c6601589bdef805a9157cb113b91dd
+Author: Kenneth Graunke kenn...@whitecape.org
+Date:   Sat Jan 17 23:21:15 2015 -0800
+
+i965: Work around mysterious Gen4 GPU hangs with minimal state changes.
+
+Gen4 hardware appears to GPU hang frequently when using Chromium, and
+also when running 'glmark2 -b ideas'.  Most of the error states contain
+3DPRIMITIVE commands in quick succession, with very few state packets
+between them - usually VERTEX_BUFFERS/ELEMENTS and CONSTANT_BUFFER.
+
+I trimmed an apitrace of the glmark2 hang down to two draw calls with a
+glUniformMatrix4fv call between the two.  Either draw by itself works
+fine, but together, they hang the GPU.  Removing the glUniform call
+makes the hangs disappear.  In the hardware state, this translates to
+removing the CONSTANT_BUFFER packet between the two 3DPRIMITIVE packets.
+
+Flushing before emitting CONSTANT_BUFFER packets also appears to make
+the hangs disappear.  I observed a slowdown in glxgears by doing it all
+the time, so I've chosen to only do it when BRW_NEW_BATCH and
+BRW_NEW_PSP are unset (i.e. we haven't done a CS_URB_STATE change or
+already flushed the whole pipeline).
+
+I'd much rather understand the problem, but at this point, I don't see
+how we'd ever be able to track it down further.  We have no real tools,
+and the hardware people moved on years ago.  I've analyzed 20+ error
+states and read every scrap of documentation I could find.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80568
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85367
+Signed-off-by: Kenneth Graunke kenn...@whitecape.org
+Acked-by: Matt Turner matts...@gmail.com
+Cc: 10.4 10.3 mesa-sta...@lists.freedesktop.org
+(cherry picked from commit c4fd0c9052dd391d6f2e9bb8e6da209dfc7ef35b)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c 
b/src/mesa/drivers/dri/i965/brw_curbe.c
+index 1a828ed..718d87c 100644
+--- a/src/mesa/drivers/dri/i965/brw_curbe.c
 b/src/mesa/drivers/dri/i965/brw_curbe.c
+@@ -280,6 +280,19 @@ brw_upload_constant_buffer(struct brw_context *brw)
+ */
+ 
+ emit:
++   /* Work around mysterious 965 hangs that appear to happen if you do
++* two 3DPRIMITIVEs with only a CONSTANT_BUFFER inbetween.  If we
++* haven't already flushed for some other reason, explicitly do so.
++*
++* We've found no documented reason why this should be necessary.
++*/
++   if (brw-gen == 4  !brw-is_g4x 
++   (brw-state.dirty.brw  (BRW_NEW_BATCH | BRW_NEW_PSP)) == 0) {
++  BEGIN_BATCH(1);
++  OUT_BATCH(MI_FLUSH);
++  ADVANCE_BATCH();
++   }
++
+/* BRW_NEW_URB_FENCE: From the gen4 PRM, volume 1, section 3.9.8
+ * (CONSTANT_BUFFER (CURBE Load)):
+ *
diff --git a/debian/patches/series b/debian/patches/series
index 494cdfb..0d106a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@
 # Ubuntu patches.
 egl-platform-mir.patch
 i915-dont-default-to-2.1.patch
-llvm-3.6-fixes.patch
+i915-fix-gen4-hangs.patch
+llvm-3.6-fixes.patch
\ No newline at end of file

commit f09055c78217196cfa377038a99fb7516add34ce
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Jan 28 16:48:55 2015 +0100

Flip the switch to llvm 3.6 with patches backported from upstream.

diff --git a/debian/changelog b/debian/changelog
index 7e1102c..da98ae7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.4.2-2ubuntu2) UNRELEASED; urgency=medium
+
+  * Flip the switch to llvm 3.6 with patches backported from upstream.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 28 Jan 2015 
14:08:49 +0100
+
 mesa (10.4.2-2ubuntu1) vivid;