mesa: Changes to 'ubuntu+1'

2017-05-11 Thread 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+1'

2016-02-25 Thread 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'

2016-02-25 Thread 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'

2016-02-25 Thread 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+1'

2015-12-20 Thread 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'

2015-12-17 Thread 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'

2015-12-17 Thread 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+1'

2015-12-04 Thread 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+1'

2015-09-14 Thread 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'

2015-09-07 Thread 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'

2015-09-04 Thread 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+1'

2015-08-24 Thread 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'

2015-08-19 Thread 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+1'

2015-07-28 Thread 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+1'

2015-07-06 Thread 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'

2015-07-06 Thread 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+1'

2015-02-12 Thread 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+1'

2015-02-10 Thread 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+1'

2015-01-28 Thread Maarten Bernardus Lankhorst 
 .gitignore   |1 
 configure.ac |  202 +
 docs/index.html  |6 
 docs/relnotes.html   |1 
 docs/relnotes/10.4.3.html|  145 +
 include/D3D9/d3d9.h  |   10 
 include/D3D9/d3d9types.h |   13 
 scons/gallium.py |3 
 src/Makefile.am  |   17 
 src/egl/drivers/dri2/platform_wayland.c  |2 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h|4 
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h|4 
 src/gallium/drivers/freedreno/a4xx/a4xx.xml.h|   31 
 src/gallium/drivers/freedreno/a4xx/fd4_gmem.c|   61 
 src/gallium/drivers/freedreno/adreno_common.xml.h|4 
 src/gallium/drivers/freedreno/adreno_pm4.xml.h   |   16 
 src/gallium/drivers/r600/evergreen_state.c   |5 
 src/gallium/drivers/r600/r600_hw_context.c   |2 
 src/gallium/drivers/r600/r600_shader.c   |   31 
 src/gallium/drivers/r600/r600_shader.h   |4 
 src/gallium/drivers/r600/r600_state.c|5 
 src/gallium/drivers/r600/r600_state_common.c |   12 
 src/gallium/drivers/radeon/r600_pipe_common.c|4 
 src/gallium/drivers/radeon/r600_pipe_common.h|8 
 src/gallium/drivers/radeon/radeon_elf_util.c |   65 
 src/gallium/drivers/radeon/radeon_elf_util.h |   15 
 src/gallium/drivers/radeon/radeon_llvm_emit.c|4 
 src/gallium/drivers/radeonsi/si_compute.c|   46 
 src/gallium/drivers/radeonsi/si_pipe.h   |1 
 src/gallium/drivers/radeonsi/si_shader.c |4 
 src/gallium/drivers/radeonsi/si_state_shaders.c  |   20 
 src/gallium/drivers/vc4/vc4_cl_dump.c|  151 +
 src/gallium/drivers/vc4/vc4_context.c|7 
 src/gallium/drivers/vc4/vc4_opt_cse.c|2 
 src/gallium/drivers/vc4/vc4_opt_small_immediates.c   |3 
 src/gallium/drivers/vc4/vc4_program.c|   29 
 src/gallium/drivers/vc4/vc4_qir.c|   22 
 src/gallium/drivers/vc4/vc4_qir.h|1 
 src/gallium/drivers/vc4/vc4_qpu.c|   83 
 src/gallium/drivers/vc4/vc4_register_allocate.c  |   22 
 src/gallium/state_trackers/clover/llvm/invocation.cpp|   51 
 src/gallium/state_trackers/nine/adapter9.c   |7 
 src/gallium/state_trackers/nine/basetexture9.c   |   66 
 src/gallium/state_trackers/nine/cubetexture9.c   |   16 
 src/gallium/state_trackers/nine/device9.c|  121 
 src/gallium/state_trackers/nine/device9.h|6 
 src/gallium/state_trackers/nine/nine_ff.c|   37 
 src/gallium/state_trackers/nine/nine_pipe.h  |5 
 src/gallium/state_trackers/nine/nine_shader.c|  667 +++-
 src/gallium/state_trackers/nine/nine_state.c |   94 
 src/gallium/state_trackers/nine/nine_state.h |3 
 src/gallium/state_trackers/nine/pixelshader9.c   |   10 
 src/gallium/state_trackers/nine/pixelshader9.h   |2 
 src/gallium/state_trackers/nine/query9.c |1 
 src/gallium/state_trackers/nine/stateblock9.c|4 
 src/gallium/state_trackers/nine/surface9.c   |   29 
 src/gallium/state_trackers/nine/swapchain9.c |2 
 src/gallium/state_trackers/nine/texture9.c   |9 
 src/gallium/state_trackers/nine/volumetexture9.c |   14 
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c|2 
 src/gbm/backends/dri/gbm_dri.c   |7 
 src/gbm/main/gbm.c   |1 
 src/glsl/Android.mk  |1 
 src/glsl/Makefile.am |   79 
 src/glsl/Makefile.sources|  302 +-
 src/glsl/ast_to_hir.cpp  |   16 
 src/glsl/blob.c  |  323 ++
 src/glsl/blob.h  |  289 ++
 src/glsl/glcpp/glcpp-parse.y |4 
 src/glsl/glsl_parser_extras.cpp  |2 
 src/glsl/glsl_parser_extras.h|4 
 src/glsl/glsl_types.cpp  |  111 
 src/glsl/glsl_types.h|9 
 src/glsl/ir_function_can_inline.cpp  |9 
 src/glsl/list.h  |   25 
 src/glsl/nir/.gitignore

mesa: Changes to 'ubuntu+1'

2015-01-14 Thread Timo Aaltonen 
 Android.mk |1 
 Makefile.am|  113 
 VERSION|2 
 configure.ac   |  479 
 debian/README.Debian   |4 
 debian/changelog   |   89 
 debian/control |  149 
 debian/libegl1-mesa-drivers.install.in |2 
 debian/libgbm1.install.in  |1 
 debian/libopenvg1-mesa-dev.install.in  |3 
 debian/libopenvg1-mesa.install.in  |1 
 debian/libopenvg1-mesa.lintian-overrides   |1 
 debian/libopenvg1-mesa.symbols |   94 
 debian/mesa-opencl-icd.install.in  |5 
 debian/patches/egl-platform-mir.patch  |  263 
 debian/rules   |4 
 docs/GL3.txt   |   72 
 docs/devinfo.html  |  300 
 docs/egl.html  |7 
 docs/index.html|   69 
 docs/install.html  |6 
 docs/llvmpipe.html |2 
 docs/relnotes.html |   12 
 docs/relnotes/10.2.7.html  |  211 
 docs/relnotes/10.2.8.html  |  130 
 docs/relnotes/10.2.9.html  |  101 
 docs/relnotes/10.2.html|2 
 docs/relnotes/10.3.1.html  |  158 
 docs/relnotes/10.3.2.html  |  115 
 docs/relnotes/10.3.3.html  |  209 
 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.3.html|1 
 docs/relnotes/10.4.1.html  |   97 
 docs/relnotes/10.4.2.html  |  127 
 docs/relnotes/10.4.html|  259 
 docs/relnotes/10.5.0.html  |   67 
 include/D3D9/d3d9.h| 1858 +++
 include/D3D9/d3d9caps.h|  387 
 include/D3D9/d3d9types.h   | 1797 +++
 include/EGL/eglplatform.h  |   10 
 include/GL/glext.h |  213 
 include/GL/internal/dri_interface.h|1 
 include/GL/internal/sarea.h|   92 
 include/GLES2/gl2ext.h |  313 
 include/HaikuGL/OpenGLKit.h|2 
 include/c99/stdbool.h  |3 
 include/c99_compat.h   |6 
 include/d3dadapter/d3dadapter9.h   |  101 
 include/d3dadapter/drm.h   |   44 
 include/d3dadapter/present.h   |  136 
 include/pci_ids/i965_pci_ids.h |   15 
 install-lib-links.mk   |6 
 m4/ax_check_gnu_make.m4|   78 
 m4/ax_check_python_mako_module.m4  |   61 
 m4/ax_gcc_func_attribute.m4|  223 
 m4/ax_prog_flex.m4 |4 
 scons/gallium.py   |   45 
 scons/llvm.py  |   16 
 src/Makefile.am|6 
 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|4 
 src/egl/drivers/dri2/platform_android.c|2 
 src/egl/drivers/dri2/platform_drm.c|   13

mesa: Changes to 'ubuntu+1'

2014-09-18 Thread Maarten Bernardus Lankhorst 
 debian/changelog|1 
 debian/patches/fix-altivec-intrinsics.patch |  111 
 debian/patches/series   |1 
 3 files changed, 113 insertions(+)

New commits:
commit 3d2d673b8719363a982a30185d1083c97000f6f9
Author: Maarten Lankhorst d...@mblankhorst.nl
Date:   Thu Sep 18 08:32:58 2014 +0200

Import upstream fix for altivec little endian instructions.

diff --git a/debian/changelog b/debian/changelog
index 09fb41a..676e8a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (10.3.0~rc3-2ubuntu1) UNRELEASED; urgency=low
 
   * Merge from released debian-experimental.
+  * Import upstream fix for altivec little endian instructions.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
 
diff --git a/debian/patches/fix-altivec-intrinsics.patch 
b/debian/patches/fix-altivec-intrinsics.patch
new file mode 100644
index 000..c67784a
--- /dev/null
+++ b/debian/patches/fix-altivec-intrinsics.patch
@@ -0,0 +1,111 @@
+commit 0feb977bbfb0d6bb2c8d3178246acb035a739f37
+Author: Ulrich Weigand uweig...@de.ibm.com
+Date:   Mon Aug 4 18:41:00 2014 +0200
+
+gallivm: Fix Altivec pack intrinsics for little-endian
+
+This patch fixes use of Altivec pack intrinsics on little-endian PowerPC
+systems.  Since little-endian operation only affects the load and store
+instructions, the semantics of pack (and other) instructions that take
+two input vectors implicitly change: the pack instructions still fill
+a register placing values from the first operand into the high parts
+of the register, and values from the second operand into the low parts
+of the register, but since vector loads and stores perform an endian swap,
+the high parts end up at high memory addresses.
+
+To still achieve the desired effect, we have to swap the two inputs to
+the pack instruction on little-endian systems.  This is done automatically
+by the back-end for instructions generated by LLVM, but needs to be done
+manually when emitting intrisincs (which still result in that instruction
+being emitted directly).
+
+Signed-off-by: Ulrich Weigand ulrich.weig...@de.ibm.com
+Signed-off-by: Maarten Lankhorst d...@mblankhorst.nl
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.c 
b/src/gallium/auxiliary/gallivm/lp_bld_pack.c
+index a48a922..cdf6d80 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_pack.c
 b/src/gallium/auxiliary/gallivm/lp_bld_pack.c
+@@ -464,6 +464,7 @@ lp_build_pack2(struct gallivm_state *gallivm,
+if((util_cpu_caps.has_sse2 || util_cpu_caps.has_altivec) 
+src_type.width * src_type.length = 128) {
+   const char *intrinsic = NULL;
++  boolean swap_intrinsic_operands = FALSE;
+ 
+   switch(src_type.width) {
+   case 32:
+@@ -482,6 +483,9 @@ lp_build_pack2(struct gallivm_state *gallivm,
+} else {
+   intrinsic = llvm.ppc.altivec.vpkuwus;
+}
++#ifdef PIPE_ARCH_LITTLE_ENDIAN
++   swap_intrinsic_operands = TRUE;
++#endif
+  }
+  break;
+   case 16:
+@@ -490,12 +494,18 @@ lp_build_pack2(struct gallivm_state *gallivm,
+   intrinsic = llvm.x86.sse2.packsswb.128;
+ } else if (util_cpu_caps.has_altivec) {
+   intrinsic = llvm.ppc.altivec.vpkshss;
++#ifdef PIPE_ARCH_LITTLE_ENDIAN
++  swap_intrinsic_operands = TRUE;
++#endif
+ }
+  } else {
+ if (util_cpu_caps.has_sse2) {
+   intrinsic = llvm.x86.sse2.packuswb.128;
+ } else if (util_cpu_caps.has_altivec) {
+ intrinsic = llvm.ppc.altivec.vpkshus;
++#ifdef PIPE_ARCH_LITTLE_ENDIAN
++  swap_intrinsic_operands = TRUE;
++#endif
+ }
+  }
+  break;
+@@ -504,7 +514,11 @@ lp_build_pack2(struct gallivm_state *gallivm,
+   if (intrinsic) {
+  if (src_type.width * src_type.length == 128) {
+ LLVMTypeRef intr_vec_type = lp_build_vec_type(gallivm, intr_type);
+-res = lp_build_intrinsic_binary(builder, intrinsic, 
intr_vec_type, lo, hi);
++if (swap_intrinsic_operands) {
++   res = lp_build_intrinsic_binary(builder, intrinsic, 
intr_vec_type, hi, lo);
++} else {
++   res = lp_build_intrinsic_binary(builder, intrinsic, 
intr_vec_type, lo, hi);
++}
+ if (dst_vec_type != intr_vec_type) {
+res = LLVMBuildBitCast(builder, res, dst_vec_type, );
+ }
+@@ -513,6 +527,8 @@ lp_build_pack2(struct gallivm_state *gallivm,
+ int num_split = src_type.width * src_type.length / 128;
+ int i;
+ int nlen = 128 / src_type.width;
++int lo_off = swap_intrinsic_operands ? nlen : 0;
++int hi_off = swap_intrinsic_operands ? 0 : nlen;
+ struct lp_type ndst_type =

mesa: Changes to 'ubuntu+1'

2014-09-18 Thread Maarten Bernardus Lankhorst 
 debian/changelog |   33 ++-
 debian/compat|2 -
 debian/control   |   13 +-
 debian/libegl1-mesa-drivers.install.linux.in |2 -
 debian/rules |2 -
 5 files changed, 45 insertions(+), 7 deletions(-)

New commits:
commit 6620b4abe0f772b97b697549b231671c4adfd30d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Sep 18 11:59:11 2014 +0200

New upstream release candidate. (LP: #1364003)

diff --git a/debian/changelog b/debian/changelog
index c7d6c72..fc28472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 mesa (10.3.0~rc3-3ubuntu1) UNRELEASED; urgency=low
 
+  * New upstream release candidate. (LP: #1364003)
   * Merge from released debian-experimental.
   * Import upstream fix for altivec little endian instructions.
 

commit a2bab76b4a260fa536d2de5619b2f74c9ec7f6da
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 15 22:39:36 2014 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index fd75f04..c159591 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
+mesa (10.3.0~rc3-3) experimental; urgency=medium
 
   [ Andreas Boll ]
   * Bump llvm-3.5-dev and libclang-3.5-dev to 1:3.5-1, should fix FTBFS on
@@ -11,7 +11,10 @@ mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
   [ Dima Kogan ]
   * All -dev packages are now Multi-Arch: same (Closes: #689088, #678040).
 
- -- Andreas Boll andreas.boll@gmail.com  Mon, 15 Sep 2014 14:19:30 +0200
+  [ Julien Cristau ]
+  * Upload clean source without partial Ubuntu alternatives patches (closes: 
#761678)
+
+ -- Julien Cristau jcris...@debian.org  Mon, 15 Sep 2014 22:39:15 +0200
 
 mesa (10.3.0~rc3-2) experimental; urgency=medium
 

commit 3803b01079d10f7ff3370e5566ba0502d96f676f
Author: Andreas Boll andreas.boll@gmail.com
Date:   Mon Sep 15 20:17:03 2014 +0200

Drop redundant libegl1-mesa-drivers.install.linux.in

It's the same as libegl1-mesa-drivers.install.in

diff --git a/debian/changelog b/debian/changelog
index 5877a8b..fd75f04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
   * Bump compat to v9 for changed dh_strip behavior:
 - dh_strip puts separated debug symbols in a location based on their
   build-id (Closes: #755921).
+  * Drop redundant libegl1-mesa-drivers.install.linux.in.
 
   [ Dima Kogan ]
   * All -dev packages are now Multi-Arch: same (Closes: #689088, #678040).
diff --git a/debian/libegl1-mesa-drivers.install.linux.in 
b/debian/libegl1-mesa-drivers.install.linux.in
deleted file mode 100644
index 741f962..000
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# OS-independent part (from libegl1-mesa-drivers.install.in):
-dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so 
usr/lib/${DEB_HOST_MULTIARCH}/egl

commit 4e8ef10eb3d85c3b79991c2189d4e7f4745e5d20
Author: Dima Kogan d...@secretsauce.net
Date:   Sun Feb 16 01:31:01 2014 -0800

All -dev packages are now Multi-Arch: same

Closes #689088, #678040

diff --git a/debian/changelog b/debian/changelog
index 0c9bfb3..5877a8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * Bump llvm-3.5-dev and libclang-3.5-dev to 1:3.5-1, should fix FTBFS on
 kfreebsd-*.
   * Bump compat to v9 for changed dh_strip behavior:
 - dh_strip puts separated debug symbols in a location based on their
   build-id (Closes: #755921).
 
+  [ Dima Kogan ]
+  * All -dev packages are now Multi-Arch: same (Closes: #689088, #678040).
+
  -- Andreas Boll andreas.boll@gmail.com  Mon, 15 Sep 2014 14:19:30 +0200
 
 mesa (10.3.0~rc3-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index cc021cc..857f2a5 100644
--- a/debian/control
+++ b/debian/control
@@ -143,6 +143,7 @@ Depends:
 Provides: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
 Conflicts: mesa-dev, libgl-dev, mesag3 ( 3.1-1), nvidia-glx-dev, mesag-dev, 
libgl1-mesa-swrast-dev
 Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
+Multi-Arch: same
 Description: free implementation of the OpenGL API -- development files
  This package provides the development environment required for
  compiling programs with Mesa.  For a complete description of Mesa,
@@ -189,6 +190,7 @@ Architecture: linux-any
 Depends:
  libxatracker2 (= ${binary:Version}),
  ${misc:Depends},
+Multi-Arch: same
 Description: X acceleration library -- development files
  This package contains the XA (X acceleration) library.  It is used exclusively
  by the X server to do render, copy and video acceleration.
@@ -237,6 +239,7 @@ Depends:
  libgbm1 (= ${binary:Version}),
  libudev-dev,
  ${misc:Depends},
+Multi-Arch: same

mesa: Changes to 'ubuntu+1'

2014-09-15 Thread Maarten Bernardus Lankhorst 
 Makefile.am  |1 
 VERSION  |2 
 configure.ac |   18 +
 debian/changelog |   22 +-
 debian/patches/01_gallium-util-add-missing-u_debug-include.patch |   39 +++
 debian/patches/fixup-ppc-ftbfs.patch |   21 -
 debian/patches/series|2 
 debian/rules |   12 -
 debian/upstream/signing-key.asc  |   29 ++
 src/gallium/drivers/freedreno/a2xx/fd2_context.c |1 
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c|   11 -
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c |   10 
 src/gallium/drivers/freedreno/a3xx/fd3_texture.h |1 
 src/gallium/drivers/freedreno/freedreno_resource.c   |  108 
++
 src/gallium/drivers/freedreno/ir3/ir3_dump.c |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp|   32 ++
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h  |5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp |4 
 src/gallium/drivers/nouveau/nv50/nv50_state.c|7 
 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c   |8 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c  |   16 -
 src/gallium/drivers/nouveau/nv50/nv50_transfer.c |2 
 src/gallium/drivers/nouveau/nv50/nv84_video.c|   15 -
 src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c  |1 
 src/gallium/drivers/r600/r600_blit.c |3 
 src/gallium/drivers/r600/r600_state_common.c |   12 -
 src/gallium/drivers/radeon/r600_query.c  |   28 ++
 src/gallium/state_trackers/dri/dri2.c|8 
 src/gallium/targets/dri/Makefile.am  |6 
 src/gallium/targets/vdpau/Makefile.am|6 
 src/gallium/winsys/svga/drm/vmw_screen_dri.c |   13 -
 src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c|   82 ++-
 src/glsl/lower_variable_index_to_cond_assign.cpp |2 
 src/mesa/drivers/common/meta.c   |   38 ---
 src/mesa/drivers/common/meta_copy_image.c|2 
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |   20 +
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp   |   23 +-
 src/mesa/drivers/dri/i965/intel_copy_image.c |   53 +++-
 src/mesa/main/attrib.c   |4 
 src/mesa/main/context.c  |3 
 src/mesa/main/macros.h   |7 
 src/mesa/state_tracker/st_extensions.c   |5 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp   |   51 +++-
 43 files changed, 514 insertions(+), 222 deletions(-)

New commits:
commit 8b46c260a4261d2b77c04565f5426ebb89be59bc
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Sep 15 12:25:53 2014 +0200

bump version

diff --git a/debian/changelog b/debian/changelog
index 64e5722..b03ef05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.3~rc3-2ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from unreleased debian-experimental.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
+
 mesa (10.3.0~rc3-2) experimental; urgency=medium
 
   [ Andreas Boll ]
@@ -24,15 +30,6 @@ mesa (10.3.0~rc3-1) experimental; urgency=medium
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 08 Sep 2014 
15:50:42 +0200
 
-mesa (10.3~rc2-0ubuntu1) UNRELEASED; urgency=low
-
-  * Merge from unreleased debian-experimental.
-  * Add patch to fix ftbfs.
-- Revert build failure causer.
-- Add fixup-ppc-ftbfs.patch
-
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
-
 mesa (10.2.6-1ubuntu1) utopic; urgency=medium
 
   * Drop 101_ubuntu_hidden_glname.patch.
diff --git a/debian/patches/fixup-ppc-ftbfs.patch 
b/debian/patches/fixup-ppc-ftbfs.patch
deleted file mode 100644
index 49c2d91..000
--- a/debian/patches/fixup-ppc-ftbfs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/gallium/auxiliary/util/u_math.h 
b/src/gallium/auxiliary/util/u_math.h
-index 25bcfb5..d703bf0 100644
 a/src/gallium/auxiliary/util/u_math.h
-+++ b/src/gallium/auxiliary/util/u_math.h
-@@ -40,6 +40,7 @@
- 
- 
- #include pipe/p_compiler.h
-+#include u_debug.h
- 
- 
- #ifdef __cplusplus
-@@ -807,7 +808,7 @@ util_memcpy_cpu_to_le32(void * restrict dest, const

mesa: Changes to 'ubuntu+1'

2014-09-15 Thread Maarten Bernardus Lankhorst 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cb700a7cca1f2f8ebad57dd62e54a36a5b7f14dd
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Sep 15 12:25:53 2014 +0200

bump version

diff --git a/debian/changelog b/debian/changelog
index 64e5722..09fb41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.3.0~rc3-2ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from released debian-experimental.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
+
 mesa (10.3.0~rc3-2) experimental; urgency=medium
 
   [ Andreas Boll ]
@@ -24,15 +30,6 @@ mesa (10.3.0~rc3-1) experimental; urgency=medium
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 08 Sep 2014 
15:50:42 +0200
 
-mesa (10.3~rc2-0ubuntu1) UNRELEASED; urgency=low
-
-  * Merge from unreleased debian-experimental.
-  * Add patch to fix ftbfs.
-- Revert build failure causer.
-- Add fixup-ppc-ftbfs.patch
-
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
-
 mesa (10.2.6-1ubuntu1) utopic; urgency=medium
 
   * Drop 101_ubuntu_hidden_glname.patch.
diff --git a/debian/patches/fixup-ppc-ftbfs.patch 
b/debian/patches/fixup-ppc-ftbfs.patch
deleted file mode 100644
index 49c2d91..000
--- a/debian/patches/fixup-ppc-ftbfs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/gallium/auxiliary/util/u_math.h 
b/src/gallium/auxiliary/util/u_math.h
-index 25bcfb5..d703bf0 100644
 a/src/gallium/auxiliary/util/u_math.h
-+++ b/src/gallium/auxiliary/util/u_math.h
-@@ -40,6 +40,7 @@
- 
- 
- #include pipe/p_compiler.h
-+#include u_debug.h
- 
- 
- #ifdef __cplusplus
-@@ -807,7 +808,7 @@ util_memcpy_cpu_to_le32(void * restrict dest, const void * 
restrict src, size_t
- {
- #ifdef PIPE_ARCH_BIG_ENDIAN
-size_t i, e;
--   assert(n % 4 == 0);
-+   debug_assert(n % 4 == 0);
- 
-for (i = 0, e = n / 4; i  e; i++) {
-   uint32_t * restrict d = (uint32_t* restrict)dest;
diff --git a/debian/patches/series b/debian/patches/series
index d4befae..8a081b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 # Ubuntu patches.
 egl-platform-mir.patch
 i915-dont-default-to-2.1.patch
-fixup-ppc-ftbfs.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/e1xtts9-0006iq...@moszumanska.debian.org

mesa: Changes to 'ubuntu+1'

2014-09-10 Thread Maarten Bernardus Lankhorst 
 debian/changelog |3 +++
 debian/patches/fixup-ppc-ftbfs.patch |   21 +
 debian/patches/series|1 +
 3 files changed, 25 insertions(+)

New commits:
commit e9fc612d087b0988b64b1d4d6742103c25983b09
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Sep 4 13:45:39 2014 +0200

Add patch to fix ftbfs.

diff --git a/debian/changelog b/debian/changelog
index 6fb5544..c9d69cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 mesa (10.3~rc2-0ubuntu1) UNRELEASED; urgency=low
 
   * Merge from unreleased debian-experimental.
+  * Add patch to fix ftbfs.
+- Revert build failure causer.
+- Add fixup-ppc-ftbfs.patch
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
 
diff --git a/debian/patches/fixup-ppc-ftbfs.patch 
b/debian/patches/fixup-ppc-ftbfs.patch
new file mode 100644
index 000..49c2d91
--- /dev/null
+++ b/debian/patches/fixup-ppc-ftbfs.patch
@@ -0,0 +1,21 @@
+diff --git a/src/gallium/auxiliary/util/u_math.h 
b/src/gallium/auxiliary/util/u_math.h
+index 25bcfb5..d703bf0 100644
+--- a/src/gallium/auxiliary/util/u_math.h
 b/src/gallium/auxiliary/util/u_math.h
+@@ -40,6 +40,7 @@
+ 
+ 
+ #include pipe/p_compiler.h
++#include u_debug.h
+ 
+ 
+ #ifdef __cplusplus
+@@ -807,7 +808,7 @@ util_memcpy_cpu_to_le32(void * restrict dest, const void * 
restrict src, size_t
+ {
+ #ifdef PIPE_ARCH_BIG_ENDIAN
+size_t i, e;
+-   assert(n % 4 == 0);
++   debug_assert(n % 4 == 0);
+ 
+for (i = 0, e = n / 4; i  e; i++) {
+   uint32_t * restrict d = (uint32_t* restrict)dest;
diff --git a/debian/patches/series b/debian/patches/series
index af4c631..54f71e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 # Ubuntu patches.
 egl-platform-mir.patch
 i915-dont-default-to-2.1.patch
+fixup-ppc-ftbfs.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/e1xrfog-00053a...@moszumanska.debian.org

mesa: Changes to 'ubuntu+1'

2014-09-01 Thread Maarten Bernardus Lankhorst 
 Makefile.am   |   10 +--
 VERSION   |2 
 debian/changelog  |   14 
 debian/control|2 
 debian/mesa-common-dev.install.in |1 
 include/pci_ids/radeonsi_pci_ids.h|7 ++
 src/gallium/auxiliary/pipe-loader/pipe_loader.h   |2 
 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c   |2 
 src/gallium/auxiliary/vl/vl_compositor.c  |2 
 src/gallium/drivers/r600/evergreen_compute.c  |8 --
 src/gallium/drivers/r600/r600_state_common.c  |4 -
 src/gallium/drivers/radeon/r600_pipe_common.c |   15 
 src/gallium/drivers/radeon/radeon_video.c |7 +-
 src/gallium/state_trackers/vdpau/device.c |   43 +-
 src/gallium/state_trackers/vdpau/output.c |   42 +
 src/gallium/state_trackers/vdpau/vdpau_private.h  |1 
 src/glsl/glcpp/glcpp-lex.l|   10 ++-
 src/mesa/drivers/dri/i965/brw_eu_compact.c|   14 +---
 src/mesa/drivers/dri/i965/brw_meta_fast_clear.c   |1 
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp|7 ++
 src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp |5 -
 21 files changed, 150 insertions(+), 49 deletions(-)

New commits:
commit c7af18177bfe6de4727b7fb5f7efbb1dfaca7ab0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Sep 1 13:08:05 2014 +0200

Revert mesa: fix make tarballs

This reverts commit 88cbe3908f0ea08228a5ffb1808f98b6906c4416.

diff --git a/Makefile.am b/Makefile.am
index 111c1c8..d2916da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ IGNORE_FILES = \
 
 parsers: configure
$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp 
glcpp/glcpp-lex.c glcpp/glcpp-parse.c glcpp/glcpp-parse.h
-   $(MAKE) -C src/mesa ../../src/mesa/program/lex.yy.c 
../../src/mesa/program/program_parse.tab.c 
../../src/mesa/program/program_parse.tab.h
+   $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c 
program/program_parse.tab.h
 
 # Everything for new a Mesa release:
 ARCHIVES = $(PACKAGE_NAME).tar.gz \
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index b23208a..e71bccb 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -36,8 +36,7 @@ endif
 gldir = $(includedir)/GL
 gl_HEADERS = $(top_srcdir)/include/GL/*.h
 
-.PHONY: $(BUILDDIR)main/git_sha1.h.tmp $(BUILDDIR)program/lex.yy.c 
$(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h
-
+.PHONY: $(BUILDDIR)main/git_sha1.h.tmp
 $(BUILDDIR)main/git_sha1.h.tmp:
@touch main/git_sha1.h.tmp
@if test -d $(top_srcdir)/.git; then \

commit 4035d69fe08e43765ff03d649f2e2057d9989e56
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Sep 1 11:30:47 2014 +0200

bump changelog

diff --git a/debian/changelog b/debian/changelog
index 21eab29..6fb5544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.3~rc2-0ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from unreleased debian-experimental.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
+
 mesa (10.3~rc2-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
@@ -11,13 +17,6 @@ mesa (10.3~rc2-1) UNRELEASED; urgency=low
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
 
-mesa (10.3~git20140821-1) UNRELEASED; urgency=low
-
-  * Build with llvm 3.5.
-  * Remove mention of tdfx.
-
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
-
 mesa (10.2.6-1ubuntu1) utopic; urgency=medium
 
   * Drop 101_ubuntu_hidden_glname.patch.

commit 2e5e3d22fc2a8d875ca1f8d311a409ba60a21b56
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Aug 14 15:02:57 2014 +0200

Remove mention of tdfx.

Conflicts:
debian/changelog
debian/control

diff --git a/debian/changelog b/debian/changelog
index c5d7c4e..ae0bbb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mesa (10.3~rc2-1) UNRELEASED; urgency=low
   [ Maarten Lankhorst ]
   * Build with llvm 3.5.
   * New upstream release.
+  * Remove mention of tdfx.
 
   [ Timo Aaltonen ]
   * mesa-common-dev: Add glcorearb.h.
diff --git a/debian/control b/debian/control
index 0c8a94b..e646957 100644
--- a/debian/control
+++ b/debian/control
@@ -676,8 +676,6 @@ Description: free implementation of the OpenGL API -- DRI 
modules
  .
  For a complete description of Mesa, please look at the
  libgl1-mesa-swx11 package.
- .
- The tdfx DRI module needs libglide3 to enable direct rendering.
 
 Package: libgl1-mesa-dri-dbg
 Section: debug

commit

mesa: Changes to 'ubuntu+1'

2014-08-21 Thread Maarten Bernardus Lankhorst 
 debian/changelog |1 +
 debian/control   |3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 61d8c07584f4be623586f65c6eb43636038d86fe
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Aug 14 15:02:57 2014 +0200

Remove mention of tdfx.

diff --git a/debian/changelog b/debian/changelog
index 95b844c..3c3e346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (10.3~git20140812-1) UNRELEASED; urgency=low
 
   * Build with llvm 3.5.
+  * Remove mention of tdfx.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 12 Aug 2014 
09:38:49 +0200
 
diff --git a/debian/control b/debian/control
index 7bd4e8b..0ba15ac 100644
--- a/debian/control
+++ b/debian/control
@@ -555,7 +555,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends: libtxc-dxtn-s2tc0 | libtxc-dxtn0
-Suggests: libglide3
 Conflicts: xlibmesa-dri ( 1:7.0.0)
 Replaces: xlibmesa-dri ( 1:7.0.0), libgl1-mesa-dri-experimental ( 7.11.1)
 Breaks:
@@ -575,8 +574,6 @@ Description: free implementation of the OpenGL API -- DRI 
modules
  .
  For a complete description of Mesa, please look at the
  libgl1-mesa-glx package.
- .
- The tdfx DRI module needs libglide3 to enable direct rendering.
 
 Package: libgl1-mesa-dri-dbg
 Section: debug


-- 
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/e1xksjn-0007oj...@moszumanska.debian.org

mesa: Changes to 'ubuntu+1'

2014-06-23 Thread Maarten Lankhorst 
 0 files changed

New commits:
commit cc9b282f8a00c1d8e552a3776709ca84e1f4467d
Author: Carl Worth cwo...@cworth.org
Date:   Tue May 20 14:22:34 2014 -0700

docs: Add release notes for the 10.1.4 release.

diff --git a/docs/relnotes/10.1.4.html b/docs/relnotes/10.1.4.html
new file mode 100644
index 000..6c02f32
--- /dev/null
+++ b/docs/relnotes/10.1.4.html
@@ -0,0 +1,97 @@
+!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.1.4 Release Notes / (May 20, 2014)/h1
+
+p
+Mesa 10.1.4 is a bug fix release which fixes bugs found since the 10.1.3 
release.
+/p
+
+p
+Mesa 10.1.4 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
+
+
+h2MD5 checksums/h2
+pre
+/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=78225;Bug 78225/a 
- Compile error due to undefined reference to `gbm_dri_backend', fix 
attached/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=78537;Bug 78537/a 
- no anisotropic filtering in a native Half-Life 2/li
+
+/ul
+
+h2Changes/h2
+
+pBrian Paul (1):/p
+ul
+  limesa: fix double-freeing of dispatch tables inside glBegin/End./li
+/ul
+
+pCarl Worth (3):/p
+ul
+  lidocs: Add MD5 sums for 10.1.3/li
+  licherry-ignore: Roland and Michel agreed to drop these patches./li
+  liVERSION: Update to 10.1.4/li
+/ul
+
+pEmil Velikov (1):/p
+ul
+  liconfigure: error out if building GBM without dri/li
+/ul
+
+pEric Anholt (1):/p
+ul
+  lii965/vs: Use samplers for UBOs in the VS like we do for non-UBO 
pulls./li
+/ul
+
+pIlia Mirkin (3):/p
+ul
+  linv50/ir: make sure to reverse cond codes on all the OP_SET variants/li
+  linv50: fix setting of texture ms info to be per-stage/li
+  linv50/ir: fix integer mul lowering for u32 x u32 -gt; high u32/li
+/ul
+
+pMichel Dänzer (1):/p
+ul
+  liradeonsi: Fix anisotropic filtering state setup/li
+/ul
+
+pTom Stellard (2):/p
+ul
+  liconfigure.ac: Add LLVM_VERSION_PATCH to DEFINES/li
+  liradeonsi: Enable geometry shaders with LLVM 3.4.1/li
+/ul
+
+/div
+/body
+/html

commit edab352b250ea687df6e61a553bb51d0093a0e14
Author: Carl Worth cwo...@cworth.org
Date:   Tue May 20 14:19:05 2014 -0700

VERSION: Update to 10.1.4

In preparation for the 10.1.4 release.

diff --git a/VERSION b/VERSION
index c8d7efc..655f923 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.3
+10.1.4

commit 2d6f733979dd3c3e3f32876bb1eb89c0693edf80
Author: Ilia Mirkin imir...@alum.mit.edu
Date:   Tue May 13 11:23:33 2014 -0400

nv50/ir: fix integer mul lowering for u32 x u32 - high u32

UNION appears to expect that all of its sources are conditionally
defined. Otherwise it inserts an unpredicated mov instruction which
overwrites the desired result. This fixes tests that use UMUL_HI, and
much less directly, unsigned integer division by a constant, which uses
this functionality in a peephole pass.

Signed-off-by: Ilia Mirkin imir...@alum.mit.edu
Cc: 10.1 10.2 mesa-sta...@lists.freedesktop.org
Reviewed-by: Ben Skeggs bske...@redhat.com
(cherry picked from commit 5b8f1a0f7c5b1412577a913d374192a2329fa615)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
index 7030c21..c4ae6c4 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
@@ -75,16 +75,17 @@ expandIntegerMUL(BuildUtil *bld, Instruction *mul)
i[4] = bld-mkOp3(OP_MAD, fTy, t[3], a[0], b[0], t[2]);
 
if (highResult) {
-  Value *r[3];
+  Value *r[4];
   Value *imm = bld-loadImm(NULL, 1  (halfSize * 8));
   c[0] = bld-getSSA(1, FILE_FLAGS);
   c[1] = bld-getSSA(1, FILE_FLAGS);
-  for (int j = 0; j  3; ++j)
+  for (int j = 0; j  4; ++j)
  r[j] = bld-getSSA(fullSize);
 
   i[8] = bld-mkOp2(OP_SHR, fTy, r[0], t[1], bld-mkImm(halfSize * 8));
   i[6] = bld-mkOp2(OP_ADD, fTy, r[1], r[0], imm);
-  bld-mkOp2(OP_UNION, TYPE_U32, r[2], r[1], r[0]);
+  bld-mkMov(r[3], r[0])-setPredicate(CC_NC, c[0]);
+  bld-mkOp2(OP_UNION, TYPE_U32, r[2], r[1], r[3]);
   i[5] = bld-mkOp3(OP_MAD, fTy, mul-getDef(0), a[1], b[1], r[2]);
 
   // set carry defs /

mesa: Changes to 'ubuntu+1'

2014-04-07 Thread Maarten Lankhorst 
 debian/changelog |   47 +++
 debian/control   |   38 -
 debian/libegl1-mesa-dev.install.linux.in |2 -
 debian/libegl1-mesa-dev.links.in |1 
 debian/libegl1-mesa-drivers.install.linux.in |4 --
 debian/libgl1-mesa-dri.install.in|1 
 debian/libgl1-mesa-dri.install.kfreebsd.in   |1 
 debian/libwayland-egl1-mesa.install.in   |3 +
 debian/libwayland-egl1-mesa.symbols  |5 ++
 debian/rules |   12 ++
 10 files changed, 97 insertions(+), 17 deletions(-)

New commits:
commit 10700ab361dccad37a1035f3c9d44238b058192a
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Mar 31 11:56:23 2014 +0200

release to trusty

diff --git a/debian/changelog b/debian/changelog
index 23fcb87..49e46dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.1.0-4ubuntu1) UNRELEASED; urgency=medium
+mesa (10.1.0-4ubuntu1) trusty; urgency=medium
 
   * Merge from unreleased debian sid.
   * Add explicit libudev1 | libudev0 dependency. (LP: #1296947)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 31 Mar 2014 
11:25:48 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 31 Mar 2014 
09:56:17 +
 
 mesa (10.1.0-5) UNRELEASED; urgency=low
 

commit 8bd9360fd4b10bcae76bec18b952844c3935f171
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Mar 31 11:56:12 2014 +0200

Add explicit libudev1 | libudev0 dependency. (LP: #1296947)

diff --git a/debian/changelog b/debian/changelog
index 520f49b..23fcb87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-4ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from unreleased debian sid.
+  * Add explicit libudev1 | libudev0 dependency. (LP: #1296947)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 31 Mar 2014 
11:25:48 +0200
+
 mesa (10.1.0-5) UNRELEASED; urgency=low
 
   * Add explicit libudev1 dependency.
diff --git a/debian/control b/debian/control
index 9b1415a..a1f52c4 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- libudev1 [linux-any],
+ libudev1 | libudev0,
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: generic buffer management API -- runtime
@@ -147,7 +147,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- libudev1 [linux-any],
+ libudev1 | libudev0,
 Recommends: libegl1-mesa-drivers
 Provides: libegl1-x11
 Conflicts: libegl1-x11
@@ -220,7 +220,7 @@ Depends:
  libegl1-mesa (= ${binary:Version}),
  libglapi-mesa (= ${binary:Version}),
  libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
- libudev1 [linux-any],
+ libudev1 | libudev0,
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: free implementation of the EGL API -- hardware drivers
@@ -478,7 +478,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
  libglapi-mesa (= ${binary:Version}),
- libudev1 [linux-any],
+ libudev1 | libudev0,
 Recommends: libgl1-mesa-dri (= 7.2)
 Conflicts: libgl1, libgl1-mesa-dri ( 6.4.0)
 Replaces: libgl1, libgl1-mesa-dri ( 6.4.0)

commit aaf71bc6cf1ad69d3770ef9d7ff78295be61abd0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Mar 31 11:35:43 2014 +0200

Add explicit libudev1 dependency.

libudev is being dlsym'd now, but still a dependency.

diff --git a/debian/changelog b/debian/changelog
index a37517d..398c6c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-5) UNRELEASED; urgency=low
+
+  * Add explicit libudev1 dependency.
+- libudev is being dlsym'd now, but still a dependency.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 31 Mar 2014 
11:25:48 +0200
+
 mesa (10.1.0-4) unstable; urgency=medium
 
   [ Andreas Boll ]
diff --git a/debian/control b/debian/control
index 063f59b..768634e 100644
--- a/debian/control
+++ b/debian/control
@@ -205,6 +205,7 @@ Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ libudev1 [linux-any],
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: generic buffer management API -- runtime
@@ -252,6 +253,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ libudev1 [linux-any],
 Recommends: libegl1-mesa-drivers
 Provides: libegl1-x11
 Conflicts: libegl1-x11
@@ -323,6 +325,7 @@ Depends:
  libegl1-mesa (= ${binary:Version}),
  libglapi-mesa (= ${binary:Version}),
  libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
+ libudev1 [linux-any],
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: free implementation of the EGL API -- hardware drivers
@@ -578,8 +581,9 @@ Section: libs
 Architecture: any
 Depends:
  ${shlibs:Depends},
- libglapi-mesa (= ${binary:Version}),
  ${misc:Depends}
+ libglapi-mesa (= ${binary:Version}),
+ libudev1

mesa: Changes to 'ubuntu+1'

2014-03-19 Thread Maarten Lankhorst 
 debian/patches/117-static-gallium.patch |2 
 debian/patches/egl-platform-mir.patch   |   92 ++--
 2 files changed, 32 insertions(+), 62 deletions(-)

New commits:
commit 15fd923a5ef5aa1463dae2592f450b928c932c68
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Mar 19 14:17:37 2014 +0100

Hopefully fix a FTBFS with libgallium on !x86.

diff --git a/debian/patches/117-static-gallium.patch 
b/debian/patches/117-static-gallium.patch
index 939cb73..f74a01c 100644
--- a/debian/patches/117-static-gallium.patch
+++ b/debian/patches/117-static-gallium.patch
@@ -55,7 +55,7 @@ index f14279b..3cdec83 100644
  
  AM_CXXFLAGS += -fno-rtti
  
-+libgallium_la_LIBADD = $(LLVM_LIBS)
++libgallium_la_LIBADD = $(LLVM_LIBS) $(PTHREAD_LIBS)
 +
  endif
  

commit 27e0bf43cd69565ccd0704aa6ecc07e4102816be
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Mar 19 13:46:58 2014 +0100

fix emberassing bug in refresh of mir patch

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 25cb606..c81e1c4 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,7 +1,5 @@
-Index: mesa/configure.ac
-===
 mesa.orig/configure.ac 2014-03-19 10:26:31.671304024 +
-+++ mesa/configure.ac  2014-03-19 10:26:31.663603967 +
+--- a/configure.ac
 b/configure.ac
 @@ -1428,7 +1428,9 @@
  
android|fbdev|gdi|null)
@@ -21,10 +19,8 @@ Index: mesa/configure.ac
  
  AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test x$HAVE_EGL_DRIVER_DRI2 != x)
  
-Index: mesa/include/EGL/eglplatform.h
-===
 mesa.orig/include/EGL/eglplatform.h2014-03-19 10:26:31.671304024 
+
-+++ mesa/include/EGL/eglplatform.h 2014-03-19 10:26:31.663803969 +
+--- a/include/EGL/eglplatform.h
 b/include/EGL/eglplatform.h
 @@ -104,6 +104,13 @@
  typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
  typedef void*EGLNativeDisplayType;
@@ -39,10 +35,8 @@ Index: mesa/include/EGL/eglplatform.h
  #elif defined(__unix__)
  
  #ifdef MESA_EGL_NO_X11_HEADERS
-Index: mesa/include/GL/internal/dri_interface.h
-===
 mesa.orig/include/GL/internal/dri_interface.h  2014-03-19 
10:26:31.671304024 +
-+++ mesa/include/GL/internal/dri_interface.h   2014-03-19 10:26:31.664103971 
+
+--- a/include/GL/internal/dri_interface.h
 b/include/GL/internal/dri_interface.h
 @@ -832,10 +832,12 @@
  unsigned int pitch;
  unsigned int cpp;
@@ -57,10 +51,8 @@ Index: mesa/include/GL/internal/dri_interface.h
  struct __DRIdri2LoaderExtensionRec {
  __DRIextension base;
  
-Index: mesa/src/egl/drivers/dri2/Makefile.am
-===
 mesa.orig/src/egl/drivers/dri2/Makefile.am 2014-03-19 10:26:31.671304024 
+
-+++ mesa/src/egl/drivers/dri2/Makefile.am  2014-03-19 10:26:31.664303972 
+
+--- a/src/egl/drivers/dri2/Makefile.am
 b/src/egl/drivers/dri2/Makefile.am
 @@ -62,3 +62,9 @@
  libegl_dri2_la_SOURCES += platform_drm.c
  AM_CFLAGS += -DHAVE_DRM_PLATFORM
@@ -71,10 +63,8 @@ Index: mesa/src/egl/drivers/dri2/Makefile.am
 +AM_CFLAGS += -DHAVE_MIR_PLATFORM
 +AM_CFLAGS += $(MIR_CFLAGS)
 +endif
-Index: mesa/src/egl/drivers/dri2/egl_dri2.c
-===
 mesa.orig/src/egl/drivers/dri2/egl_dri2.c  2014-03-19 10:26:31.671304024 
+
-+++ mesa/src/egl/drivers/dri2/egl_dri2.c   2014-03-19 10:26:31.664803976 
+
+--- a/src/egl/drivers/dri2/egl_dri2.c
 b/src/egl/drivers/dri2/egl_dri2.c
 @@ -643,6 +643,12 @@
   return EGL_TRUE;
return dri2_initialize_wayland(drv, disp);
@@ -88,10 +78,8 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.c
  #endif
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
-Index: mesa/src/egl/drivers/dri2/egl_dri2.h
-===
 mesa.orig/src/egl/drivers/dri2/egl_dri2.h  2014-03-19 10:26:31.671304024 
+
-+++ mesa/src/egl/drivers/dri2/egl_dri2.h   2014-03-19 10:26:31.665003978 
+
+--- a/src/egl/drivers/dri2/egl_dri2.h
 b/src/egl/drivers/dri2/egl_dri2.h
 @@ -64,6 +64,11 @@
  
  #endif /* HAVE_ANDROID_PLATFORM */
@@ -145,10 +133,8 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
 +dri2_initialize_mir(_EGLDriver *drv, _EGLDisplay *disp);
 +
  #endif /* EGL_DRI2_INCLUDED */
-Index: mesa/src/egl/drivers/dri2/platform_mir.c
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ mesa/src/egl/drivers/dri2/platform_mir.c   2014-03-19 10:29:05.292947070 
+
+--- /dev/null
 b/src/egl/drivers/dri2/platform_mir.c
 @@ -0,0 +1,456 @@
 +/*
 + * Copyright © 2012

mesa: Changes to 'ubuntu+1'

2014-02-19 Thread Maarten Lankhorst 
 debian/changelog   |6 +
 debian/patches/fix-defaults-glxfbconfig.patch  |   55 ++
 debian/patches/fix-sort-glxfbconfig.patch  |   58 +++
 debian/patches/series  |2 
 src/gallium/docs/source/screen.rst |6 +
 src/gallium/drivers/freedreno/freedreno_screen.c   |5 +
 src/gallium/drivers/i915/i915_screen.c |5 +
 src/gallium/drivers/ilo/ilo_screen.c   |3 
 src/gallium/drivers/llvmpipe/lp_screen.c   |3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp |   39 +-
 src/gallium/drivers/nouveau/nouveau_screen.h   |5 +
 src/gallium/drivers/nouveau/nouveau_vp3_video.c|   78 -
 src/gallium/drivers/nouveau/nv30/nv30_screen.c |4 -
 src/gallium/drivers/nouveau/nv50/nv50_screen.c |3 
 src/gallium/drivers/nouveau/nv50/nv84_video.c  |   68 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c |3 
 src/gallium/drivers/r300/r300_screen.c |2 
 src/gallium/drivers/r600/r600_pipe.c   |6 +
 src/gallium/drivers/radeonsi/si_pipe.c |6 +
 src/gallium/drivers/softpipe/sp_screen.c   |3 
 src/gallium/drivers/svga/svga_screen.c |2 
 src/gallium/include/pipe/p_defines.h   |4 -
 src/mesa/drivers/dri/i915/i830_vtbl.c  |8 +-
 src/mesa/drivers/dri/i915/i915_context.c   |2 
 src/mesa/drivers/dri/i915/i915_texstate.c  |2 
 src/mesa/drivers/dri/i915/i915_vtbl.c  |8 +-
 src/mesa/drivers/dri/i915/intel_fbo.c  |2 
 src/mesa/drivers/dri/i915/intel_screen.c   |2 
 src/mesa/drivers/dri/i965/brw_blorp.cpp|4 -
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp   |6 -
 src/mesa/drivers/dri/i965/brw_clear.c  |2 
 src/mesa/drivers/dri/i965/brw_misc_state.c |6 -
 src/mesa/drivers/dri/i965/brw_surface_formats.c|   12 +--
 src/mesa/drivers/dri/i965/intel_fbo.c  |2 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c  |8 +-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h  |4 -
 src/mesa/drivers/dri/i965/intel_screen.c   |4 -
 src/mesa/drivers/dri/nouveau/nv04_surface.c|8 +-
 src/mesa/drivers/dri/radeon/radeon_fbo.c   |   10 +-
 src/mesa/drivers/dri/radeon/radeon_screen.c|4 -
 src/mesa/drivers/dri/radeon/radeon_texture.c   |4 -
 src/mesa/main/format_pack.c|   22 ++---
 src/mesa/main/format_unpack.c  |   12 +--
 src/mesa/main/formats.c|   16 ++--
 src/mesa/main/formats.h|4 -
 src/mesa/main/readpix.c|2 
 src/mesa/main/shaderapi.c  |1 
 src/mesa/main/texformat.c  |6 -
 src/mesa/main/texstore.c   |8 +-
 src/mesa/state_tracker/st_extensions.c |2 
 src/mesa/state_tracker/st_format.c |8 +-
 src/mesa/swrast/s_depth.c  |   14 +--
 src/mesa/swrast/s_drawpix.c|4 -
 src/mesa/swrast/s_renderbuffer.c   |2 
 src/mesa/swrast/s_stencil.c|2 
 src/mesa/swrast/s_texfetch.c   |4 -
 src/mesa/swrast/s_texfetch_tmp.h   |4 -
 57 files changed, 459 insertions(+), 116 deletions(-)

New commits:
commit b439d0715b2d823434fb0d7179472442b70ea97c
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Feb 19 17:19:43 2014 +0100

release to trusty

diff --git a/debian/changelog b/debian/changelog
index 5496d20..cca5709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (10.1.0~rc1-1ubuntu1) UNRELEASED; urgency=low
+mesa (10.1.0~rc1-1ubuntu1) trusty; urgency=low
 
   * First mesa 10.1 release candidate.
   * Refresh egl-platform-mir.patch and drop upstreamed bits.
   * Merge more upstream fixes post rc1.
   * Cherry pick some fixes for GLX fbconfig. (LP: #1278168)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 12 Feb 2014 
14:42:42 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 19 Feb 2014 
17:19:12 +0100
 
 mesa (10.1.0~rc1-1) experimental; urgency=low
 

commit ccb1b1caa355701d649a7f67f31b3e3f5c9c7a7e
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Feb 19 10:07:45 2014 +0100

Merge more upstream fixes post rc1.

Cherry pick some fixes for GLX fbconfig. (LP: #1278168)

diff --git a/debian/changelog b/debian/changelog
index bc14cca..5496d20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mesa (10.1.0~rc1-1ubuntu1) UNRELEASED; urgency=low
 
   * First mesa 10.1 release candidate.
   * Refresh egl-platform-mir.patch and drop

mesa: Changes to 'ubuntu+1'

2014-02-13 Thread Maarten Lankhorst 
 debian/patches/egl-platform-mir.patch |   64 +-
 1 file changed, 40 insertions(+), 24 deletions(-)

New commits:
commit bc1860b08f08162f7590bc0f09f56ea13d4c14be
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Feb 13 12:21:22 2014 +0100

refresh egl-platform-mir patch with upstreamed version

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 5369db8..871894c 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -394,8 +394,6 @@
 +   dri2_surf-dri_buffers[i]);
 +  }
 +   }
-+   free(dri2_surf-dri_buffers[__DRI_BUFFER_FRONT_LEFT]);
-+   free(dri2_surf-dri_buffers[__DRI_BUFFER_BACK_LEFT]);
 +
 +   free(dri2_surf-gbm_surf);
 +   free(surf);
@@ -497,6 +495,8 @@
 +   uint32_t types;
 +   int i;
 +
++   loader_set_logger(_eglLog);
++
 +   drv-API.CreateWindowSurface = dri2_create_mir_window_surface;
 +   drv-API.DestroySurface = dri2_destroy_mir_surface;
 +   drv-API.SwapBuffers = dri2_swap_buffers;
@@ -574,8 +574,8 @@
 +}
 --- a/src/egl/main/Makefile.am
 +++ b/src/egl/main/Makefile.am
-@@ -102,6 +102,11 @@
- AM_CFLAGS += -DHAVE_NULL_PLATFORM
+@@ -108,6 +108,11 @@
+ libEGL_la_LIBADD += $(DLOPEN_LIBS)
  endif
  
 +if HAVE_EGL_PLATFORM_MIR
@@ -583,9 +583,9 @@
 +AM_CFLAGS += $(MIR_CFLAGS)
 +endif
 +
- if HAVE_EGL_DRIVER_GLX
- AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
- libEGL_la_LIBADD += ../drivers/glx/libegl_glx.la
+ if HAVE_EGL_DRIVER_DRI2
+ AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
+ AM_CFLAGS += -DHAVE_XCB_DRI2
 --- a/src/egl/main/egldisplay.c
 +++ b/src/egl/main/egldisplay.c
 @@ -59,7 +59,10 @@
@@ -828,6 +828,24 @@
  }
  
  
+--- a/src/gallium/state_trackers/dri/drm/dri2.c
 b/src/gallium/state_trackers/dri/drm/dri2.c
+@@ -266,8 +266,13 @@
+ 
+   templ.format = format;
+   templ.bind = bind;
+-  whandle.type = DRM_API_HANDLE_TYPE_SHARED;
+-  whandle.handle = buf-name;
++  if (buf-name != 0) {
++ whandle.type = DRM_API_HANDLE_TYPE_SHARED;
++ whandle.handle = buf-name;
++  } else {
++ whandle.type = DRM_API_HANDLE_TYPE_FD;
++ whandle.handle = buf-fd;
++  }
+   whandle.stride = buf-pitch;
+ 
+   drawable-textures[statt] =
 --- a/src/gbm/backends/dri/gbm_dri.c
 +++ b/src/gbm/backends/dri/gbm_dri.c
 @@ -133,7 +133,7 @@
@@ -991,23 +1009,22 @@
const char *buffer_name);
  
 -static void
-+static bool
++static int
  intel_update_image_buffers(struct brw_context *brw, __DRIdrawable *drawable);
  
  static void
-@@ -1082,9 +1082,8 @@
+@@ -1082,9 +1082,7 @@
 if (unlikely(INTEL_DEBUG  DEBUG_DRI))
fprintf(stderr, enter %s, drawable %p\n, __func__, drawable);
  
 -   if (screen-image.loader)
 -  intel_update_image_buffers(brw, drawable);
 -   else
-+   /* Try using the Image loader extension; if that fails, fall back to DRI2 
*/
 +   if (!screen-image.loader || !intel_update_image_buffers(brw, drawable))
intel_update_dri2_buffers(brw, drawable);
  
 driUpdateFramebufferSize(brw-ctx, drawable);
-@@ -1256,13 +1255,15 @@
+@@ -1256,13 +1254,15 @@
 if (num_samples == 0) {
 if (rb-mt 
 rb-mt-region 
@@ -1025,7 +1042,7 @@
return;
 }
  
-@@ -1274,13 +1275,24 @@
+@@ -1274,13 +1274,23 @@
 }
  
 intel_miptree_release(rb-mt);
@@ -1036,7 +1053,7 @@
 -  buffer-pitch,
 -  buffer-name,
 -  buffer_name);
-+   if (buffer-name != 0) {
++   if (buffer-name != 0)
 +  region = intel_region_alloc_for_handle(brw-intelScreen,
 + buffer-cpp,
 + drawable-w,
@@ -1044,38 +1061,37 @@
 + buffer-pitch,
 + buffer-name,
 + buffer_name);
-+   } else {
++   else
 +  region = intel_region_alloc_for_fd(brw-intelScreen,
 + buffer-cpp,
 + drawable-w,
 + drawable-h,
 + buffer-pitch,
-+ drawable-h * buffer-pitch,
++ 0, /* Can we be so stupid? */
 + buffer-fd,
 + buffer_name);
-+   }
 if (!region)
return;
  
-@@ -1346,7 +1358,7 @@
+@@ -1346,7 +1356,7 @@
region);
  }
  
 -static void
-+static bool
++static int
  intel_update_image_buffers(struct brw_context *brw, __DRIdrawable *drawable)
  {
 struct gl_framebuffer *fb = drawable-driverPrivate;
-@@ -1365,7 +1377,7 @@
+@@ -1365,7 +1375,7 @@

mesa: Changes to 'ubuntu+1'

2014-02-12 Thread Maarten Lankhorst 
 debian/changelog  |7 
 debian/patches/egl-platform-mir.patch | 1027 --
 2 files changed, 35 insertions(+), 999 deletions(-)

New commits:
commit f779852d44bc2a151afa9c380ef0a65603dda6af
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Feb 12 14:43:02 2014 +0100

add changelog entry

diff --git a/debian/changelog b/debian/changelog
index c732663..bc14cca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0~rc1-1ubuntu1) UNRELEASED; urgency=low
+
+  * First mesa 10.1 release candidate.
+  * Refresh egl-platform-mir.patch and drop upstreamed bits.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 12 Feb 2014 
14:42:42 +0100
+
 mesa (10.1.0~rc1-1) experimental; urgency=low
 
   * New upstream release.

commit 24233eadced0de9d8a828f802c8e29ffc804f024
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Feb 12 13:46:56 2014 +0100

refresh egl-platform-mir patch

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 8a7617b..5369db8 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1428,7 +1428,9 @@
+@@ -1468,7 +1468,9 @@
  
android|fbdev|gdi|null)
;;
@@ -11,7 +11,7 @@
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
;;
-@@ -1457,6 +1459,7 @@
+@@ -1497,6 +1499,7 @@
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo $egl_platforms | grep 'drm' 
/dev/null 21)
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo $egl_platforms | grep 'fbdev' 
/dev/null 21)
  AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo $egl_platforms | grep 'null' 
/dev/null 21)
@@ -37,7 +37,7 @@
  #ifdef MESA_EGL_NO_X11_HEADERS
 --- a/include/GL/internal/dri_interface.h
 +++ b/include/GL/internal/dri_interface.h
-@@ -819,10 +819,12 @@
+@@ -826,10 +826,12 @@
  unsigned int pitch;
  unsigned int cpp;
  unsigned int flags;
@@ -53,7 +53,7 @@
  
 --- a/src/egl/drivers/dri2/Makefile.am
 +++ b/src/egl/drivers/dri2/Makefile.am
-@@ -63,3 +63,9 @@
+@@ -64,3 +64,9 @@
  libegl_dri2_la_SOURCES += platform_drm.c
  AM_CFLAGS += -DHAVE_DRM_PLATFORM
  endif
@@ -65,7 +65,7 @@
 +endif
 --- a/src/egl/drivers/dri2/egl_dri2.c
 +++ b/src/egl/drivers/dri2/egl_dri2.c
-@@ -632,6 +632,12 @@
+@@ -639,6 +639,12 @@
   return EGL_TRUE;
return dri2_initialize_wayland(drv, disp);
  #endif
@@ -103,7 +103,7 @@
 int (*authenticate) (_EGLDisplay *disp, uint32_t id);
  };
  
-@@ -183,7 +192,9 @@
+@@ -182,7 +191,9 @@
 struct gbm_dri_surface *gbm_surf;
  #endif
  
@@ -114,7 +114,7 @@
 __DRIbuffer   *dri_buffers[__DRI_BUFFER_COUNT];
 struct {
  #ifdef HAVE_WAYLAND_PLATFORM
-@@ -205,6 +216,10 @@
+@@ -204,6 +215,10 @@
 /* EGL-owned buffers */
 __DRIbuffer   *local_buffers[__DRI_BUFFER_COUNT];
  #endif
@@ -125,19 +125,17 @@
  };
  
  
-@@ -266,6 +281,9 @@
+@@ -271,4 +286,7 @@
  EGLBoolean
  dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp);
  
 +EGLBoolean
 +dri2_initialize_mir(_EGLDriver *drv, _EGLDisplay *disp);
 +
- char *
- dri2_get_driver_for_fd(int fd);
- char *
+ #endif /* EGL_DRI2_INCLUDED */
 --- /dev/null
 +++ b/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,435 @@
+@@ -0,0 +1,436 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -168,6 +166,7 @@
 +#include mir_toolkit/mesa/native_display.h
 +
 +#include egl_dri2.h
++#include loader.h
 +
 +#include stdlib.h
 +#include string.h
@@ -344,7 +343,7 @@
 +  struct gbm_dri_surface *surf = malloc(sizeof *surf);
 +
 +  dri2_surf-gbm_surf = surf;
-+  surf-base.gbm = dri2_dpy-gbm_dri-base;
++  surf-base.gbm = dri2_dpy-gbm_dri-base.base;
 +  surf-base.width = dri2_surf-base.Width;
 +  surf-base.height = dri2_surf-base.Height;
 +  surf-base.format = GBM_FORMAT_ARGB;
@@ -516,7 +515,7 @@
 +   dri2_dpy-mir_disp = disp-PlatformDisplay;
 +   dri2_dpy-mir_disp-display_get_platform(dri2_dpy-mir_disp, platform);
 +   dri2_dpy-fd = platform.fd[0];
-+   dri2_dpy-device_name = dri2_get_device_name_for_fd(dri2_dpy-fd);
++   dri2_dpy-device_name = loader_get_device_name_for_fd(dri2_dpy-fd);
 +
 +   /*
 +* At the moment, a pointer to gbm_device is the first and only
@@ -700,7 +699,7 @@
 +   _EGLDriver *Driver[_EGL_NUM_PLATFORMS];
  } _EGLModule;
  
- static _EGL_DECLARE_MUTEX(_eglModuleMutex);
+ static _EGLMutex _eglModuleMutex = _EGL_MUTEX_INITIALIZER;
 @@ -134,7 +134,6 @@
  
  #endif
@@ -831,16 +830,7 @@
  
 --- a/src/gbm/backends/dri/gbm_dri.c
 +++ b/src/gbm/backends/dri/gbm_dri.c
-@@ -44,6 +44,8 @@
- #include gbm_driint.h
- 
- #include gbmint.h
-+#include xf86drm.h
-+
- 
- /* For importing wl_buffer */
- #if HAVE_WAYLAND_PLATFORM
-@@ -132,7 +134,7 @@
+@@ -133,7 +133,7 @@
  };
  
  static const __DRIdri2LoaderExtension dri2_loader_extension = {
@@ -849,7 +839,7 @@
 dri_get_buffers,

mesa: Changes to 'ubuntu+1'

2013-04-17 Thread Timo Aaltonen 
 debian/changelog |7 +++
 debian/control   |2 +-
 debian/rules |2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 8e163b1447c81d28e179a0e8af8e4eeafda13cac
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Apr 17 11:22:53 2013 +0300

control, rules: Add llvm-3.2-dev to build-depends for powerpc, enable 
gallium llvm and shared libs (FTBFS).

diff --git a/debian/changelog b/debian/changelog
index 3207f23..6be2ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (9.1.1-0ubuntu2) raring; urgency=low
+
+  * control, rules: Add llvm-3.2-dev to build-depends for powerpc, enable
+gallium llvm and shared libs (FTBFS).
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 17 Apr 2013 01:42:38 -0600
+
 mesa (9.1.1-0ubuntu1) raring; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 58f76eb..0e965dc 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
  libudev-dev [linux-any],
  flex,
  bison,
- llvm-3.2-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.2-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf powerpc],
  libwayland-dev (= 1.0.2) [linux-any],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
diff --git a/debian/rules b/debian/rules
index c33d35f..da971f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,7 +94,7 @@ else
   endif
 
   # LLVM is required for r300g and recommended for swrastg on x86:
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
armhf))
+  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
armhf powerpc))
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += --with-llvm-shared-libs
   endif


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1usnli-0001rf...@vasks.debian.org

mesa: Changes to 'ubuntu+1'

2013-04-16 Thread Timo Aaltonen 
 debian/changelog |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 375c5b501bd199497f7e447335454d3187c3869a
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Apr 16 15:35:54 2013 +0300

release to raring

diff --git a/debian/changelog b/debian/changelog
index ff6a1d0..3207f23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
+mesa (9.1.1-0ubuntu1) raring; urgency=low
 
   [ Timo Aaltonen ]
   * Merge from unreleased debian git
-- new upstream release (LP: #1112147)
+- new upstream release (LP: #1112147, #1164093)
   * Revert a commit to fix slow blur on intel.
   * vbo-fix-crash.diff: Patch from the stable tree that fixes a crasher
 with shared display lists.
@@ -10,7 +10,7 @@ mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
   [ Maarten Lankhorst ]
   * Add some more patches to fix image copy regressions on nouveau.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 27 Feb 2013 11:12:43 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 16 Apr 2013 15:35:32 +0300
 
 mesa (9.1.1-1) UNRELEASED; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1usb3a-0002ci...@vasks.debian.org

mesa: Changes to 'ubuntu+1'

2013-04-09 Thread Timo Aaltonen 
 debian/changelog|2 
 debian/patches/revert-a64c1eb9b110.diff |  392 
 debian/patches/series   |   37 +--
 3 files changed, 412 insertions(+), 19 deletions(-)

New commits:
commit acaaa5da70d6ee44e781149165fd32c36b5d800c
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Apr 10 00:55:49 2013 +0300

revert a64c1eb9b110 instead of using a ton of patches that still doesn't 
fix blur on ILK

diff --git a/debian/changelog b/debian/changelog
index 7c8652a..ff6a1d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * Merge from unreleased debian git
 - new upstream release (LP: #1112147)
-  * Added a bunch of patches to fix slow blur on intel.
+  * Revert a commit to fix slow blur on intel.
   * vbo-fix-crash.diff: Patch from the stable tree that fixes a crasher
 with shared display lists.
 
diff --git a/debian/patches/revert-a64c1eb9b110.diff 
b/debian/patches/revert-a64c1eb9b110.diff
new file mode 100644
index 000..950157f
--- /dev/null
+++ b/debian/patches/revert-a64c1eb9b110.diff
@@ -0,0 +1,392 @@
+--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
 b/src/mesa/drivers/dri/i965/brw_fs.cpp
+@@ -219,45 +219,6 @@ fs_visitor::CMP(fs_reg dst, fs_reg src0,
+return inst;
+ }
+ 
+-exec_list
+-fs_visitor::VARYING_PULL_CONSTANT_LOAD(fs_reg dst, fs_reg surf_index,
+-   fs_reg offset)
+-{
+-   exec_list instructions;
+-   fs_inst *inst;
+-
+-   if (intel-gen = 7) {
+-  inst = new(mem_ctx) fs_inst(FS_OPCODE_VARYING_PULL_CONSTANT_LOAD_GEN7,
+-  dst, surf_index, offset);
+-  instructions.push_tail(inst);
+-   } else {
+-  int base_mrf = 13;
+-  bool header_present = true;
+-
+-  fs_reg mrf = fs_reg(MRF, base_mrf + header_present);
+-  mrf.type = BRW_REGISTER_TYPE_D;
+-
+-  /* On gen6+ we want the dword offset passed in, but on gen4/5 we need a
+-   * dword-aligned byte offset.
+-   */
+-  if (intel-gen == 6) {
+- instructions.push_tail(MOV(mrf, offset));
+-  } else {
+- instructions.push_tail(MUL(mrf, offset, fs_reg(4)));
+-  }
+-  inst = MOV(mrf, offset);
+-  inst = new(mem_ctx) fs_inst(FS_OPCODE_VARYING_PULL_CONSTANT_LOAD,
+-  dst, surf_index);
+-  inst-header_present = header_present;
+-  inst-base_mrf = base_mrf;
+-  inst-mlen = header_present + dispatch_width / 8;
+-
+-  instructions.push_tail(inst);
+-   }
+-
+-   return instructions;
+-}
+-
+ /**
+  * A helper for MOV generation for fixing up broken hardware SEND dependency
+  * handling.
+@@ -443,7 +404,6 @@ fs_reg::equals(const fs_reg r) const
+type == r.type 
+negate == r.negate 
+abs == r.abs 
+-   !reladdr  !r.reladdr 
+memcmp(fixed_hw_reg, r.fixed_hw_reg,
+   sizeof(fixed_hw_reg)) == 0 
+smear == r.smear 
+@@ -1561,81 +1521,6 @@ fs_visitor::remove_dead_constants()
+return true;
+ }
+ 
+-/*
+- * Implements array access of uniforms by inserting a
+- * PULL_CONSTANT_LOAD instruction.
+- *
+- * Unlike temporary GRF array access (where we don't support it due to
+- * the difficulty of doing relative addressing on instruction
+- * destinations), we could potentially do array access of uniforms
+- * that were loaded in GRF space as push constants.  In real-world
+- * usage we've seen, though, the arrays being used are always larger
+- * than we could load as push constants, so just always move all
+- * uniform array access out to a pull constant buffer.
+- */
+-void
+-fs_visitor::move_uniform_array_access_to_pull_constants()
+-{
+-   int pull_constant_loc[c-prog_data.nr_params];
+-
+-   for (unsigned int i = 0; i  c-prog_data.nr_params; i++) {
+-  pull_constant_loc[i] = -1;
+-   }
+-
+-   /* Walk through and find array access of uniforms.  Put a copy of that
+-* uniform in the pull constant buffer.
+-*
+-* Note that we don't move constant-indexed accesses to arrays.  No
+-* testing has been done of the performance impact of this choice.
+-*/
+-   foreach_list_safe(node, this-instructions) {
+-  fs_inst *inst = (fs_inst *)node;
+-
+-  for (int i = 0 ; i  3; i++) {
+- if (inst-src[i].file != UNIFORM || !inst-src[i].reladdr)
+-continue;
+-
+- int uniform = inst-src[i].reg;
+-
+- /* If this array isn't already present in the pull constant buffer,
+-  * add it.
+-  */
+- if (pull_constant_loc[uniform] == -1) {
+-const float **values = c-prog_data.param[uniform];
+-
+-pull_constant_loc[uniform] = c-prog_data.nr_pull_params;
+-
+-assert(param_size[uniform]);
+-
+-for (int j = 0; j  param_size[uniform]; j++) {
+-   c-prog_data.pull_param[c-prog_data.nr_pull_params++] =
+-

mesa: Changes to 'ubuntu+1'

2013-04-08 Thread Timo Aaltonen 
 debian/changelog  |2 ++
 debian/patches/series |3 +++
 debian/patches/vbo-fix-crash.diff |   29 +
 3 files changed, 34 insertions(+)

New commits:
commit 304a86694e531ed9980cb761762f93c662fd4304
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Apr 8 09:47:33 2013 +0300

vbo-fix-crash.diff: Patch from the stable tree that fixes a crasher with 
shared display lists.

diff --git a/debian/changelog b/debian/changelog
index c0f735e..7c8652a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
   * Merge from unreleased debian git
 - new upstream release (LP: #1112147)
   * Added a bunch of patches to fix slow blur on intel.
+  * vbo-fix-crash.diff: Patch from the stable tree that fixes a crasher
+with shared display lists.
 
   [ Maarten Lankhorst ]
   * Add some more patches to fix image copy regressions on nouveau.
diff --git a/debian/patches/series b/debian/patches/series
index f2a4e13..bd5bfc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,7 +35,10 @@ i965-specialize-surface_state-creation.diff
 0010-i965-fs-Don-t-double-emit-SEND-dependency-workaround.patch
 0011-i965-fs-Use-LD-messages-for-pre-gen7-varying-index-u.patch
 0012-i965-fs-Allow-CSE-on-pre-gen7-varying-index-uniform-.patch
+
 0001-nv50-fix-3D-render-target-setup.patch
 0002-nv50-nvc0-disable-DEPTH_RANGE_NEAR-FAR-clipping-duri.patch
 0003-nv50-nvc0-fix-3d-blits-restore-viewport-after-blit.patch
 0004-nvc0-fix-for-2d-engine-R-source-formats-writing-RRR1.patch
+
+vbo-fix-crash.diff
diff --git a/debian/patches/vbo-fix-crash.diff 
b/debian/patches/vbo-fix-crash.diff
new file mode 100644
index 000..03b52b2
--- /dev/null
+++ b/debian/patches/vbo-fix-crash.diff
@@ -0,0 +1,29 @@
+commit e6616948b74531eae3137585b3ae35a1fc0f8174
+Author: Brian Paul bri...@vmware.com
+Date:   Wed Mar 6 12:08:17 2013 -0700
+
+vbo: fix crash found with shared display lists
+
+This fixes a crash when a display list is created in one context
+but executed from a second one.  The vbo_save_context::vertex_store
+memeber will be NULL if we never created a display list with the
+context.  Just check for that before dereferencing the pointer.
+
+Fixes http://bugzilla.redhat.com/show_bug.cgi?id=918661
+
+Note: This is a candidate for the stable branches.
+(cherry picked from commit c2665aacdd14beec9580246736c602e3ff04d7ae)
+
+diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
+index efb386e..f5b5c41 100644
+--- a/src/mesa/vbo/vbo_save_draw.c
 b/src/mesa/vbo/vbo_save_draw.c
+@@ -253,7 +253,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void 
*data)
+struct vbo_save_context *save = vbo_context(ctx)-save;
+GLboolean remap_vertex_store = GL_FALSE;
+ 
+-   if (save-vertex_store-buffer) {
++   if (save-vertex_store  save-vertex_store-buffer) {
+   /* The vertex store is currently mapped but we're about to replay
+* a display list.  This can happen when a nested display list is
+* being build with GL_COMPILE_AND_EXECUTE.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1up5so-00019o...@vasks.debian.org

mesa: Changes to 'ubuntu+1'

2013-04-04 Thread Maarten Lankhorst 
 debian/changelog   
|3 
 debian/patches/0001-nv50-fix-3D-render-target-setup.patch  
|   56 +
 debian/patches/0002-nv50-nvc0-disable-DEPTH_RANGE_NEAR-FAR-clipping-duri.patch 
|   56 +
 debian/patches/0003-nv50-nvc0-fix-3d-blits-restore-viewport-after-blit.patch   
|  139 +++
 debian/patches/0004-nvc0-fix-for-2d-engine-R-source-formats-writing-RRR1.patch 
|  407 ++
 debian/patches/series  
|4 
 6 files changed, 665 insertions(+)

New commits:
commit d3292d2163cc959cfa750c5fa72f5181f29046f3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Apr 4 18:52:36 2013 +0200

Add some more patches to fix image copy regressions on nouveau.

diff --git a/debian/changelog b/debian/changelog
index 26a916b..c0f735e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
 - new upstream release (LP: #1112147)
   * Added a bunch of patches to fix slow blur on intel.
 
+  [ Maarten Lankhorst ]
+  * Add some more patches to fix image copy regressions on nouveau.
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 27 Feb 2013 11:12:43 +0200
 
 mesa (9.1.1-1) UNRELEASED; urgency=low
diff --git a/debian/patches/0001-nv50-fix-3D-render-target-setup.patch 
b/debian/patches/0001-nv50-fix-3D-render-target-setup.patch
new file mode 100644
index 000..a02be67
--- /dev/null
+++ b/debian/patches/0001-nv50-fix-3D-render-target-setup.patch
@@ -0,0 +1,56 @@
+From 7410ba12657fa3652d05c99d44eda68231b9c100 Mon Sep 17 00:00:00 2001
+From: Christoph Bumiller e0425...@student.tuwien.ac.at
+Date: Mon, 25 Mar 2013 19:41:18 +0100
+Subject: [PATCH 1/4] nv50: fix 3D render target setup
+
+---
+ src/gallium/drivers/nv50/nv50_state_validate.c | 12 ++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c 
b/src/gallium/drivers/nv50/nv50_state_validate.c
+index a95e96d..f5e7b36 100644
+--- a/src/gallium/drivers/nv50/nv50_state_validate.c
 b/src/gallium/drivers/nv50/nv50_state_validate.c
+@@ -9,6 +9,7 @@ nv50_validate_fb(struct nv50_context *nv50)
+struct pipe_framebuffer_state *fb = nv50-framebuffer;
+unsigned i;
+unsigned ms_mode = NV50_3D_MULTISAMPLE_MODE_MS1;
++   uint32_t array_size = 0x, array_mode = 0;
+ 
+nouveau_bufctx_reset(nv50-bufctx_3d, NV50_BIND_FB);
+ 
+@@ -23,6 +24,13 @@ nv50_validate_fb(struct nv50_context *nv50)
+   struct nv50_surface *sf = nv50_surface(fb-cbufs[i]);
+   struct nouveau_bo *bo = mt-base.bo;
+ 
++  array_size = MIN2(array_size, sf-depth);
++  if (mt-layout_3d)
++ array_mode = NV50_3D_RT_ARRAY_MODE_MODE_3D; /* 1  16 */
++
++  /* can't mix 3D with ARRAY or have RTs of different depth/array_size */
++  assert(mt-layout_3d || !array_mode || array_size == 1);
++
+   BEGIN_NV04(push, NV50_3D(RT_ADDRESS_HIGH(i)), 5);
+   PUSH_DATAh(push, bo-offset + sf-offset);
+   PUSH_DATA (push, bo-offset + sf-offset);
+@@ -34,7 +42,7 @@ nv50_validate_fb(struct nv50_context *nv50)
+  PUSH_DATA (push, sf-width);
+  PUSH_DATA (push, sf-height);
+  BEGIN_NV04(push, NV50_3D(RT_ARRAY_MODE), 1);
+- PUSH_DATA (push, sf-depth);
++ PUSH_DATA (push, array_mode | array_size);
+   } else {
+  PUSH_DATA (push, 0);
+  PUSH_DATA (push, 0);
+@@ -63,7 +71,7 @@ nv50_validate_fb(struct nv50_context *nv50)
+   struct nv50_miptree *mt = nv50_miptree(fb-zsbuf-texture);
+   struct nv50_surface *sf = nv50_surface(fb-zsbuf);
+   struct nouveau_bo *bo = mt-base.bo;
+-  int unk = mt-base.base.target == PIPE_TEXTURE_2D;
++  int unk = mt-base.base.target == PIPE_TEXTURE_3D || sf-depth == 1;
+ 
+   BEGIN_NV04(push, NV50_3D(ZETA_ADDRESS_HIGH), 5);
+   PUSH_DATAh(push, bo-offset + sf-offset);
+-- 
+1.8.2
+
diff --git 
a/debian/patches/0002-nv50-nvc0-disable-DEPTH_RANGE_NEAR-FAR-clipping-duri.patch
 
b/debian/patches/0002-nv50-nvc0-disable-DEPTH_RANGE_NEAR-FAR-clipping-duri.patch
new file mode 100644
index 000..3b04386
--- /dev/null
+++ 
b/debian/patches/0002-nv50-nvc0-disable-DEPTH_RANGE_NEAR-FAR-clipping-duri.patch
@@ -0,0 +1,56 @@
+From 5ba62ee2011b44e8a40bab6435a8edaf03cda612 Mon Sep 17 00:00:00 2001
+From: Christoph Bumiller e0425...@student.tuwien.ac.at
+Date: Sun, 31 Mar 2013 22:10:02 +0200
+Subject: [PATCH 2/4] nv50,nvc0: disable DEPTH_RANGE_NEAR/FAR clipping during
+ blit
+
+We send position.z == 0, DEPTH_RANGE may be some arbitrary range
+not including 0 (for exmaple in piglit's hiz tests).
+---
+ src/gallium/drivers/nv50/nv50_surface.c | 2 ++
+ src/gallium/drivers/nvc0/nvc0_3d.xml.h  | 2 +-
+ src/gallium/drivers/nvc0/nvc0_surface.c | 2 ++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/nv50/nv50_surface.c 
b/src/gallium/drivers/nv50/nv50_surface.c
+index

mesa: Changes to 'ubuntu+1'

2013-04-01 Thread Timo Aaltonen 
 debian/changelog   
|1 
 debian/patches/0001-i965-fs-Remove-creation-of-a-MOV-instruction-that-s-.patch 
|   29 
 debian/patches/0002-i965-fs-Move-varying-uniform-offset-compuation-into-.patch 
|   90 +++
 debian/patches/0003-i965-Make-the-constant-surface-interface-take-a-norm.patch 
|  141 
 debian/patches/0004-i965-Make-the-fragment-shader-pull-constants-index-b.patch 
|  162 +
 debian/patches/0005-i965-fs-Avoid-inappropriate-optimization-with-regs_w.patch 
|   34 +
 debian/patches/0006-i965-fs-Improve-performance-of-varying-index-uniform.patch 
|  127 
 debian/patches/0007-i965-fs-Do-CSE-on-gen7-s-varying-index-pull-constant.patch 
|   84 ++
 debian/patches/0008-i965-fs-Clean-up-the-setup-of-gen4-simd16-message-de.patch 
|   36 +
 debian/patches/0009-i965-fs-Bake-regs_written-into-the-IR-instead-of-rec.patch 
|  293 ++
 debian/patches/0010-i965-fs-Don-t-double-emit-SEND-dependency-workaround.patch 
|   37 +
 debian/patches/0011-i965-fs-Use-LD-messages-for-pre-gen7-varying-index-u.patch 
|  258 
 debian/patches/0012-i965-fs-Allow-CSE-on-pre-gen7-varying-index-uniform-.patch 
|   37 +
 debian/patches/i965-add-a-bit-more-instruction-dumping.diff
|   57 +
 debian/patches/i965-also-do-the-gen4-send-dependency.diff  
|   58 +
 debian/patches/i965-enable-cse-on-uniform-pull-constant-loads.diff 
|   35 +
 debian/patches/i965-fix-broken-rendering-in-large-shaders.diff 
|   27 
 debian/patches/i965-specialize-surface_state-creation.diff 
|  127 
 debian/patches/i965-switch-to-using-sampler-ld-messages.diff   
|  209 +++
 debian/patches/series  
|   20 
 20 files changed, 1862 insertions(+)

New commits:
commit a6f3122dcf667b178a73c0db6eabc14089f4e334
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Apr 1 09:06:24 2013 +0300

Added a bunch of patches to fix slow blur on intel.

diff --git a/debian/changelog b/debian/changelog
index 6e7686f..26a916b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * Merge from unreleased debian git
 - new upstream release (LP: #1112147)
+  * Added a bunch of patches to fix slow blur on intel.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 27 Feb 2013 11:12:43 +0200
 
diff --git 
a/debian/patches/0001-i965-fs-Remove-creation-of-a-MOV-instruction-that-s-.patch
 
b/debian/patches/0001-i965-fs-Remove-creation-of-a-MOV-instruction-that-s-.patch
new file mode 100644
index 000..3368dff
--- /dev/null
+++ 
b/debian/patches/0001-i965-fs-Remove-creation-of-a-MOV-instruction-that-s-.patch
@@ -0,0 +1,29 @@
+From e3bb00afd8528eab84e57ce3004aa65358d8c34f Mon Sep 17 00:00:00 2001
+From: Eric Anholt e...@anholt.net
+Date: Wed, 13 Mar 2013 12:17:25 -0700
+Subject: [PATCH 01/12] i965/fs: Remove creation of a MOV instruction that's
+ never used.
+
+We weren't inserting it into the list, so it did nothing.  This line was
+replaced by the MOV/MUL block above.
+
+NOTE: This is a candidate for the 9.1 branch.
+---
+ src/mesa/drivers/dri/i965/brw_fs.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp 
b/src/mesa/drivers/dri/i965/brw_fs.cpp
+index 5a5bfeb..2fb8989 100644
+--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
 b/src/mesa/drivers/dri/i965/brw_fs.cpp
+@@ -253,7 +253,6 @@ fs_visitor::VARYING_PULL_CONSTANT_LOAD(fs_reg dst, fs_reg 
surf_index,
+   } else {
+  instructions.push_tail(MUL(mrf, offset, fs_reg(4)));
+   }
+-  inst = MOV(mrf, offset);
+   inst = new(mem_ctx) fs_inst(FS_OPCODE_VARYING_PULL_CONSTANT_LOAD,
+   dst, surf_index);
+   inst-header_present = header_present;
+-- 
+1.8.1.2
+
diff --git 
a/debian/patches/0002-i965-fs-Move-varying-uniform-offset-compuation-into-.patch
 
b/debian/patches/0002-i965-fs-Move-varying-uniform-offset-compuation-into-.patch
new file mode 100644
index 000..e706bb1
--- /dev/null
+++ 
b/debian/patches/0002-i965-fs-Move-varying-uniform-offset-compuation-into-.patch
@@ -0,0 +1,90 @@
+From 88a5caea52f56aab5641fddfd23732cb3ecfaf13 Mon Sep 17 00:00:00 2001
+From: Eric Anholt e...@anholt.net
+Date: Wed, 13 Mar 2013 12:27:17 -0700
+Subject: [PATCH 02/12] i965/fs: Move varying uniform offset compuation into
+ the helper func.
+
+I'm going to want to change the math for gen7 using sampler LD
+instructions in a way that gets CSE to occur like we'd hope.
+
+NOTE: This is a candidate for the 9.1 branch.
+---
+ src/mesa/drivers/dri/i965/brw_fs.cpp | 16 +---
+ src/mesa/drivers/dri/i965/brw_fs.h   |  3 ++-
+ src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |  5 ++---
+ 3 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp

mesa: Changes to 'ubuntu+1'

2013-03-22 Thread Timo Aaltonen 
 Makefile.am   |2 
 bin/.cherry-ignore|1 
 bin/get-pick-list.sh  |2 
 common.py |2 
 configure.ac  |5 
 debian/changelog  |   56 ++-
 debian/libgl1-mesa-dri.install.in |3 
 debian/patches/gbm-remember-to-init-format.patch  |   28 -
 debian/patches/series |1 
 docs/index.html   |   17 +
 docs/relnotes-9.1.1.html  |  232 ++
 docs/relnotes-9.1.html|6 
 docs/relnotes.html|1 
 include/pci_ids/i965_pci_ids.h|   18 -
 include/pci_ids/r600_pci_ids.h|   11 
 scons/gallium.py  |3 
 scons/llvm.py |   14 
 src/egl/drivers/dri2/egl_dri2.c   |9 
 src/gallium/auxiliary/draw/draw_pipe_clip.c   |   11 
 src/gallium/auxiliary/draw/draw_pipe_offset.c |   40 ++
 src/gallium/auxiliary/util/u_range.h  |   89 +
 src/gallium/drivers/llvmpipe/lp_state_rasterizer.c|6 
 src/gallium/drivers/llvmpipe/lp_texture.c |4 
 src/gallium/drivers/r600/evergreen_hw_context.c   |3 
 src/gallium/drivers/r600/evergreen_state.c|   43 ++
 src/gallium/drivers/r600/r600.h   |   12 
 src/gallium/drivers/r600/r600_asm.c   |   11 
 src/gallium/drivers/r600/r600_buffer.c|   19 +
 src/gallium/drivers/r600/r600_hw_context.c|   14 
 src/gallium/drivers/r600/r600_hw_context_priv.h   |2 
 src/gallium/drivers/r600/r600_llvm.c  |6 
 src/gallium/drivers/r600/r600_pipe.c  |   16 
 src/gallium/drivers/r600/r600_pipe.h  |4 
 src/gallium/drivers/r600/r600_state.c |6 
 src/gallium/drivers/r600/r600_state_common.c  |   14 
 src/gallium/drivers/r600/r600d.h  |1 
 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c   |   17 +
 src/gallium/drivers/radeonsi/radeonsi_shader.c|   11 
 src/gallium/drivers/radeonsi/radeonsi_shader.h|1 
 src/gallium/drivers/radeonsi/si_state.c   |5 
 src/gallium/drivers/radeonsi/si_state_draw.c  |   20 -
 src/gallium/state_trackers/glx/xlib/xm_api.c  |3 
 src/gallium/targets/dri-vmwgfx/Makefile.am|6 
 src/gallium/targets/vdpau-softpipe/Makefile.am|2 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |8 
 src/gbm/backends/dri/gbm_dri.c|2 
 src/mesa/drivers/common/meta.c|   17 -
 src/mesa/drivers/dri/i965/Makefile.am |1 
 src/mesa/drivers/dri/i965/brw_fs.cpp  |  290 +-
 src/mesa/drivers/dri/i965/brw_fs.h|5 
 src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp |3 
 src/mesa/drivers/dri/i965/brw_fs_cse.cpp  |3 
 src/mesa/drivers/dri/i965/brw_fs_emit.cpp |   42 --
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp  |   28 -
 src/mesa/drivers/dri/i965/brw_vs_constval.c   |   19 +
 src/mesa/drivers/dri/intel/intel_chipset.h|   18 -
 src/mesa/drivers/dri/nouveau/nouveau_driver.c |3 
 src/mesa/main/attrib.c|   12 
 src/mesa/main/context.c   |1 
 src/mesa/main/glformats.c |2 
 src/mesa/main/points.c|3 
 src/mesa/main/teximage.c  |8 
 src/mesa/main/texparam.c  |6 
 src/mesa/main/version.h   |4 
 src/mesa/state_tracker/st_atom_rasterizer.c   |   10 
 src/mesa/state_tracker/st_cb_bitmap.c |   13 
 src/mesa/state_tracker/st_draw.c  |2 
 src/mesa/state_tracker/st_program.c   |2 
 68 files changed, 1052 insertions(+), 227 deletions(-)

New commits:
commit 27fd51bcff30af81f5d606356530f1e2c48fd23b
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Mar 22 10:10:26 2013 +0200

drop gbm-remember-to-init-format.patch, upstream

diff --git a/debian/changelog b/debian/changelog
index 78320fa..6e7686f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,7 @@ mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * Merge from unreleased debian git
-- new upstream release
-  * gbm-remember-to-init-format.patch: Commit from master to
-init format on gbm_dri_bo_create. (LP: #1112147)
+- new

mesa: Changes to 'ubuntu+1'

2013-03-20 Thread Maarten Lankhorst 
 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28d3a343b0c63e1ea3c5d66d673f3db5226ff126
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Mar 20 09:48:07 2013 +0100

add llvm-3.2-dev to build-depends for armhf

Thanks to zwenna for noticing.

diff --git a/debian/control b/debian/control
index 633f5e7..58f76eb 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
  libudev-dev [linux-any],
  flex,
  bison,
- llvm-3.2-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
+ llvm-3.2-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (= 1.0.2) [linux-any],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uieht-0005h5...@vasks.debian.org

mesa: Changes to 'ubuntu+1'

2013-03-14 Thread Maarten Lankhorst 
New branch 'ubuntu+1' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ug5nf-0001kz...@vasks.debian.org

mesa: Changes to 'ubuntu+1'

2013-03-14 Thread Maarten Lankhorst 
 debian/changelog|4 
 debian/control  |1 +
 debian/libgles2-mesa-dev.install.in |1 +
 debian/not-installed|5 +
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 06af2a265545dc803ab0aecbce9d7ee44ab0ca0e
Author: Rico Tzschichholz ric...@ubuntu.com
Date:   Thu Mar 14 13:26:53 2013 +0100

fix up packaging with the changes from xorg-edgers

diff --git a/debian/changelog b/debian/changelog
index 1758afb..3f6a80a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 mesa (9.1-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Merge from unreleased debian git
 - new upstream release
   * gbm-remember-to-init-format.patch: Commit from master to
 init format on gbm_dri_bo_create. (LP: #1112147)
 
+  [ Rico Tzschichholz ]
+  * Update packaging mesa packaging with xorg-edgers
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Wed, 27 Feb 2013 11:12:43 +0200
 
 mesa (9.1-1) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 059bc58..633f5e7 100644
--- a/debian/control
+++ b/debian/control
@@ -190,6 +190,7 @@ Depends:
  libxdamage-dev,
  libxfixes-dev,
  libxcb-glx0-dev,
+ libxcb-dri2-0-dev,
  libx11-xcb-dev,
  ${misc:Depends},
 Description: free implementation of the EGL API -- development files
diff --git a/debian/libgles2-mesa-dev.install.in 
b/debian/libgles2-mesa-dev.install.in
index 981c491..e7d4422 100644
--- a/debian/libgles2-mesa-dev.install.in
+++ b/debian/libgles2-mesa-dev.install.in
@@ -1,3 +1,4 @@
 dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so 
usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
 dri/usr/include/GLES2 usr/include
+dri/usr/include/GLES3 usr/include
 dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv2.pc 
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/not-installed b/debian/not-installed
index e071eb7..c247944 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -4,7 +4,4 @@
 NOT_INSTALLED := \
dri/etc/drirc \
dri/usr/include/GL/wglext.h \
-   dri/usr/include/GL/wmesa.h \
-   dri/usr/include/GLES3/gl3platform.h \
-   dri/usr/include/GLES3/gl3ext.h \
-   dri/usr/include/GLES3/gl3.h
+   dri/usr/include/GL/wmesa.h


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ug7w3-0001fd...@vasks.debian.org