mesa: Changes to 'debian-jessie-backports'
VERSION | 2
bin/get-extra-pick-list.sh | 22
bin/get-fixes-pick-list.sh | 61 +
bin/get-pick-list.sh | 7
bin/get-typod-pick-list.sh | 7
configure.ac | 2
debian/changelog | 14
debian/control | 2
debian/copyright | 4
debian/source/local-options | 2
docs/relnotes/13.0.4.html | 3
docs/relnotes/13.0.5.html | 209 ++++++
scons/gallium.py | 2
src/amd/vulkan/radv_device.c | 2
src/amd/vulkan/si_cmd_buffer.c | 11
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c | 14
src/compiler/Makefile.glsl.am | 1
src/compiler/Makefile.sources | 2
src/compiler/glsl/ir_array_refcount.cpp | 254 +++++++
src/compiler/glsl/ir_array_refcount.h | 183 +++++
src/compiler/glsl/link_uniform_blocks.cpp | 112 ++-
src/compiler/glsl/link_uniforms.cpp | 82 +-
src/compiler/glsl/linker.cpp | 3
src/compiler/glsl/tests/array_refcount_test.cpp | 717 +++++++++++++++++++++
src/compiler/nir/nir_search.c | 48 -
src/compiler/spirv/spirv_to_nir.c | 31
src/compiler/spirv/vtn_variables.c | 6
src/egl/Makefile.am | 2
src/egl/drivers/dri2/platform_wayland.c | 1
src/gallium/auxiliary/tgsi/tgsi_dump.c | 24
src/gallium/drivers/freedreno/Makefile.am | 1
src/gallium/drivers/nouveau/nvc0/nve4_compute.c | 1
src/gallium/drivers/nouveau/nvc0/nve4_compute.h | 7
src/gallium/drivers/r600/r600_shader.c | 2
src/gallium/drivers/r600/sb/sb_valtable.cpp | 8
src/gallium/drivers/radeon/r600_buffer_common.c | 17
src/gallium/drivers/radeonsi/si_state_draw.c | 3
src/gallium/drivers/swr/rasterizer/core/clip.h | 39 -
src/gallium/drivers/vc4/vc4_opt_small_immediates.c | 11
src/gallium/drivers/vc4/vc4_program.c | 8
src/gallium/drivers/vc4/vc4_qir.c | 1
src/gallium/drivers/vc4/vc4_qir.h | 2
src/gallium/drivers/vc4/vc4_qpu_emit.c | 2
src/gallium/state_trackers/clover/Makefile.am | 2
src/gallium/state_trackers/dri/Makefile.am | 2
src/gallium/targets/d3dadapter9/Makefile.am | 2
src/glx/Makefile.am | 4
src/glx/apple/Makefile.am | 4
src/glx/g_glxglvnddispatchindices.h | 8
src/glx/windows/Makefile.am | 2
src/intel/blorp/blorp_clear.c | 23
src/intel/isl/isl_format.c | 5
src/intel/vulkan/anv_cmd_buffer.c | 5
src/intel/vulkan/anv_descriptor_set.c | 8
src/intel/vulkan/anv_image.c | 7
src/intel/vulkan/genX_cmd_buffer.c | 7
src/loader/Makefile.am | 2
src/mapi/Makefile.am | 4
src/mesa/drivers/dri/i915/Makefile.am | 2
src/mesa/drivers/dri/i965/Makefile.am | 7
src/mesa/drivers/dri/i965/brw_blorp.c | 2
src/mesa/drivers/dri/i965/brw_clear.c | 56 +
src/mesa/drivers/dri/i965/brw_program.c | 43 +
src/mesa/drivers/dri/i965/brw_sampler_state.c | 30
src/mesa/drivers/dri/i965/brw_state.h | 1
src/mesa/drivers/dri/i965/gen8_depth_state.c | 16
src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 29
src/mesa/drivers/dri/r200/Makefile.am | 2
src/mesa/drivers/dri/radeon/Makefile.am | 2
src/mesa/drivers/dri/swrast/Makefile.am | 2
src/mesa/drivers/osmesa/Makefile.am | 2
src/mesa/main/mtypes.h | 15
src/mesa/main/tests/Makefile.am | 2
src/mesa/state_tracker/st_extensions.c | 2
src/mesa/vbo/vbo_save_api.c | 7
src/util/macros.h | 8
src/vulkan/wsi/wsi_common_wayland.c | 27
src/vulkan/wsi/wsi_common_x11.c | 3
78 files changed, 2010 insertions(+), 265 deletions(-)
New commits:
commit 02ebdb5cade4ad65c4d0cebfdb279d7141503746
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Mar 7 09:33:17 2017 +0100
Rebuild for jessie-backports.
diff --git a/debian/changelog b/debian/changelog
index e4e5ac4..af41ef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (13.0.5-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 07 Mar 2017 09:32:43 +0100
+
mesa (13.0.5-1) unstable; urgency=medium
* New upstream release.
commit 413ab6747a9f5fb672c028b2eef22bc9faa8abd4
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Feb 21 13:14:02 2017 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f5b5e9f..27d06a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (13.0.5-1) UNRELEASED; urgency=medium
+mesa (13.0.5-1) unstable; urgency=medium
* New upstream release.
* Switch mesa3d.org URLs to https.
* Update extend-diff-ignore.
- -- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 21 Feb 2017 11:53:15 +0100
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 21 Feb 2017 13:13:50 +0100
mesa (13.0.4-1) unstable; urgency=medium
commit 4b14b8a48ca94d52c2ebdb0f387086c17a026f9f
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Feb 21 12:24:31 2017 +0100
Update extend-diff-ignore.
diff --git a/debian/changelog b/debian/changelog
index f4e092c..f5b5e9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (13.0.5-1) UNRELEASED; urgency=medium
* New upstream release.
* Switch mesa3d.org URLs to https.
+ * Update extend-diff-ignore.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 21 Feb 2017 11:53:15 +0100
diff --git a/debian/source/local-options b/debian/source/local-options
index 5dc5566..b8819db 100644
--- a/debian/source/local-options
+++ b/debian/source/local-options
@@ -10,7 +10,7 @@ extend-diff-ignore = Android.*mk|CleanSpec\.mk
extend-diff-ignore = \.clang-format|\.dir-locals\.el|\.editorconfig|\.mailmap|\.travis\.yml|appveyor\.yml
# misc. files and scripts used by Mesa developers but not required for the build
-extend-diff-ignore = src/compiler/nir/README|src/gallium/drivers/vc4/kernel/README|REVIEWERS|scripts/get_reviewer\.pl|bin/\.cherry-ignore|bin/bugzilla_mesa\.sh|bin/get-extra-pick-list\.sh|bin/get-pick-list\.sh|bin/get-typod-pick-list\.sh|bin/perf-annotate-jit|bin/shortlog_mesa\.sh|src/intel/blorp/TODO|src/mapi/glapi/gen/next_available_offset\.sh|src/mesa/drivers/dri/gen-symbol-redefs\.py|src/mesa/drivers/dri/r200/Doxyfile
+extend-diff-ignore = src/compiler/nir/README|src/gallium/drivers/vc4/kernel/README|REVIEWERS|scripts/get_reviewer\.pl|bin/\.cherry-ignore|bin/bugzilla_mesa\.sh|bin/get-extra-pick-list\.sh|bin/get-fixes-pick-list\.sh|bin/get-pick-list\.sh|bin/get-typod-pick-list\.sh|bin/perf-annotate-jit|bin/shortlog_mesa\.sh|src/intel/blorp/TODO|src/mapi/glapi/gen/next_available_offset\.sh|src/mesa/drivers/dri/gen-symbol-redefs\.py|src/mesa/drivers/dri/r200/Doxyfile
# radeonsi GLSL lit tests (for developers only)
extend-diff-ignore = src/gallium/drivers/radeonsi/glsl_tests/
commit 5cecb1961c454a30dcf9cd7b890190becc029cfa
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Feb 21 11:57:36 2017 +0100
Switch mesa3d.org URLs to https.
diff --git a/debian/changelog b/debian/changelog
index 5269fe7..f4e092c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (13.0.5-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Switch mesa3d.org URLs to https.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 21 Feb 2017 11:53:15 +0100
diff --git a/debian/control b/debian/control
index 9c2f750..780ebc3 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Build-Depends:
libclc-dev (>= 0.2.0+git20160907) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf],
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git
-Homepage: http://mesa3d.org/
+Homepage: https://mesa3d.org/
Package: libxatracker2
Section: libs
diff --git a/debian/copyright b/debian/copyright
index 8b2c18b..f48f482 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ Magallon <mmagallo@debian.org> on Sat, 25 Dec 2004 14:50:02 -0600. It was
again debianized by Thierry Reding <thierry@gilfi.de> on Sat, 14 Oct 2006
02:01:12 +0200.
-It was downloaded from http://www.mesa3d.org/download.html
+It was downloaded from https://www.mesa3d.org/download.html
For more information see:
- http://www.mesa3d.org/
+ https://www.mesa3d.org/
-------------------------------------------------------------------------------
The Mesa distribution consists of several components. Different copyrights and
commit f3c2832403d1ec3453ea6a0c76abbff5f35b0fd6
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Feb 21 11:54:18 2017 +0100
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index b1788b9..5269fe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (13.0.5-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 21 Feb 2017 11:53:15 +0100
+
mesa (13.0.4-1) unstable; urgency=medium
* New upstream release.
commit 71f3ff57fa67ef72630821f4fa13a17e264d7ccb
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 20 11:43:27 2017 +0000
docs: add release notes for 13.0.5
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
diff --git a/docs/relnotes/13.0.5.html b/docs/relnotes/13.0.5.html
new file mode 100644
index 0000000..9debaf7
--- /dev/null
+++ b/docs/relnotes/13.0.5.html
@@ -0,0 +1,209 @@
+<!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">
+ <title>Mesa Release Notes</title>
+ <link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+ <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 13.0.5 Release Notes / February 20, 2017</h1>
+
+<p>
+Mesa 13.0.5 is a bug fix release which fixes bugs found since the 13.0.4 release.
+</p>
+<p>
+Mesa 13.0.5 implements the OpenGL 4.4 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.4. OpenGL
+4.4 is <strong>only</strong> available if requested at context creation
+because compatibility contexts are not supported.
+</p>
+
+
+<h2>SHA256 checksums</h2>
+<pre>
+TBD
+</pre>
+
+
+<h2>New features</h2>
+<p>None</p>
+
+
+<h2>Bug fixes</h2>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98329";>Bug 98329</a> - [dEQP, EGL, SKL, BDW, BSW] dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98421";>Bug 98421</a> - src/loader/loader.c:111:40: error: unknown type name ‘drmDevicePtr’</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98526";>Bug 98526</a> - glsl/tests/general-ir-test regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99532";>Bug 99532</a> - Compute shader doesn't give right result under some circumstances</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99631";>Bug 99631</a> - segfault with OSVRTrackerView and openscenegraph git master</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99633";>Bug 99633</a> - rasterizer/core/clip.h:279:49: error: ‘const struct API_STATE’ has no member named ‘linkageCount’</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99692";>Bug 99692</a> - [radv] Mostly broken on Hawaii PRO/CIK ASICs</li>
+
+</ul>
+
+<h2>Changes</h2>
+
+<p>Bartosz Tomczyk (2):</p>
+<ul>
+ <li>r600: Fix stack overflow</li>
+ <li>r600/sb: Fix memory leak</li>
+</ul>
+
+<p>Bruce Cherniak (1):</p>
+<ul>
+ <li>swr: [rasterizer core] Remove dead code Clipper::ClipScalar()</li>
+</ul>
+
+<p>Chad Versace (1):</p>
+<ul>
+ <li>i965/mt: Disable HiZ when sharing depth buffer externally (v2)</li>
+</ul>
+
+<p>Dave Airlie (3):</p>
+<ul>
+ <li>radv: change base aligmment for allocated memory.</li>
+ <li>radv: fix cik macroModeIndex.</li>
+ <li>radv: adopt some init config workarounds from radeonsi.</li>
+</ul>
+
+<p>Derek Foreman (1):</p>
+<ul>
+ <li>egl/dri2: add image_loader_extension back into loader extensions for wayland</li>
+</ul>
+
+<p>Emil Velikov (26):</p>
+<ul>
+ <li>docs: add sha256 checksums for 13.0.4</li>
+ <li>configure.ac: list radeon in --with-vulkan-drivers help string</li>
+ <li>i965: automake: correctly set MKDIR_GEN</li>
+ <li>freedreno: automake: correctly set MKDIR_GEN</li>
+ <li>i965: automake: include builddir prior to srcdir</li>
+ <li>i915: automake: include builddir prior to srcdir</li>
+ <li>egl: automake: include builddir prior to srcdir</li>
+ <li>clover: automake: include builddir prior to srcdir</li>
+ <li>st/dri: automake: include builddir prior to srcdir</li>
+ <li>d3dadapter9: automake: include builddir prior to srcdir</li>
+ <li>glx: automake: include builddir prior to srcdir</li>
+ <li>glx/apple: automake: include builddir prior to srcdir</li>
+ <li>glx/windows: automake: include builddir prior to srcdir</li>
+ <li>loader: automake: include builddir prior to srcdir</li>
+ <li>mapi: automake: include builddir prior to srcdir</li>
+ <li>radeon, r200: automake: include builddir prior to srcdir</li>
+ <li>dri/swrast: automake: include builddir prior to srcdir</li>
+ <li>dri/osmesa: automake: include builddir prior to srcdir</li>
+ <li>mesa/tests: automake: include builddir prior to srcdir</li>
+ <li>bin/get-extra-pick-list: use git merge-base to get the branchpoint</li>
+ <li>bin/get-extra-pick-list: rework to use already_picked list</li>
+ <li>bin/get-typod-pick-list.sh: limit `git grep ...' to only as needed</li>
+ <li>bin/get-pick-list.sh: limit `git grep ...' only as needed</li>
+ <li>bin/get-pick-list.sh: remove ancient way of nominating patches</li>
+ <li>bin/get-fixes-pick-list.sh: add new script</li>
+ <li>Update version to 13.0.5</li>
+</ul>
+
+<p>Eric Anholt (1):</p>
+<ul>
+ <li>vc4: Avoid emitting small immediates for UBO indirect load address guards.</li>
+</ul>
+
+<p>Hans de Goede (1):</p>
+<ul>
+ <li>glx/glvnd: Fix GLXdispatchIndex sorting</li>
+</ul>
+
+<p>Ian Romanick (11):</p>
+<ul>
+ <li>linker: Slight code rearrange to prevent duplication in the next commit</li>
+ <li>linker: Accurately track gl_uniform_block::stageref</li>
+ <li>glsl: Split process_block_array into two functions</li>
+ <li>glsl: Fix wonkey indentation left from previous commit</li>
+ <li>glsl: Track the linearized array index for each UBO instance array element</li>
+ <li>glsl: Use simpler visitor to determine which UBO and SSBO blocks are used</li>
+ <li>glsl: Add tracking for elements of an array-of-arrays that have been accessed</li>
+ <li>glsl: Add structures to track accessed elements of a single array</li>
+ <li>glsl: Mark a set of array elements as accessed using a list of array_deref_range</li>
+ <li>glsl: Walk a list of ir_dereference_array to mark array elements as accessed</li>
+ <li>linker: Accurately mark a uniform block instance array element as used in a stage</li>
+</ul>
+
+<p>Ilia Mirkin (3):</p>
+<ul>
+ <li>vbo: process buffer binding state changes on draw when recording</li>
+ <li>st/mesa: MAX_VARYING is the max supported number of patch varyings, not min</li>
+ <li>nvc0: disable linked tsc mode in compute launch descriptor</li>
+</ul>
+
+<p>Jason Ekstrand (11):</p>
+<ul>
+ <li>nir/search: Use the correct bit size for integer comparisons</li>
+ <li>i965/blorp: Use the correct ISL format for combined depth/stencil</li>
+ <li>intel/blorp: Handle clearing of A4B4G4R4 on all platforms</li>
+ <li>isl/formats: Only advertise sampling for A4B4G4R4 on Broadwell</li>
+ <li>anv: Flush render cache before STATE_BASE_ADDRESS on gen7</li>
+ <li>anv: Improve flushing around STATE_BASE_ADDRESS</li>
+ <li>vulkan/wsi/wayland: Handle VK_INCOMPLETE for GetFormats</li>
+ <li>vulkan/wsi/wayland: Handle VK_INCOMPLETE for GetPresentModes</li>
+ <li>vulkan/wsi: Lower the maximum image sizes</li>
+ <li>i965/sampler_state: Pass texObj into update_sampler_state</li>
+ <li>i965/sampler_state: Set the "Base Mip Level" field on Sandy Bridge</li>
+</ul>
+
+<p>Kenneth Graunke (1):</p>
+<ul>
+ <li>i965: Unbind deleted shaders from brw_context, fixing malloc heisenbug.</li>
+</ul>
+
+<p>Lionel Landwerlin (5):</p>
+<ul>
+ <li>anv: don't require render target isl bit for depth/stencil surfaces</li>
+ <li>anv: set command buffer to NULL when allocations fail</li>
+ <li>anv: fix descriptor pool internal size allocation</li>
+ <li>spirv: handle OpUndef as part of the variable parsing pass</li>
+ <li>spirv: handle undefined components for OpVectorShuffle</li>
+</ul>
+
+<p>Marc-André Lureau (1):</p>
+<ul>
+ <li>tgsi-dump: dump label if instruction has one</li>
+</ul>
+
+<p>Marek Olšák (2):</p>
+<ul>
+ <li>radeonsi: always set the TCL1_ACTION_ENA when invalidating L2</li>
+ <li>gallium/radeon: fix performance of buffer readbacks</li>
+</ul>
+
+<p>Topi Pohjolainen (2):</p>
+<ul>
+ <li>i965: Make depth clear flushing more explicit</li>
+ <li>i965/gen6: Issue direct depth stall and flush after depth clear</li>
+</ul>
+
+<p>Vinson Lee (2):</p>
+<ul>
+ <li>scons: Require libdrm >= 2.4.66 for DRM.</li>
+ <li>util: Fix Clang trivial destructor check.</li>
+</ul>
+
+
+</div>
+</body>
+</html>
commit 8d622e91d407da24357aa237179b2c409c77d75b
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 20 10:01:46 2017 +0000
Update version to 13.0.5
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
diff --git a/VERSION b/VERSION
index 1b8bd35..f64807a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.4
+13.0.5
commit 1d561d8147a0c3142a2c0bc1dc19d091aaa74152
Author: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Mon Feb 13 11:14:51 2017 -0500
nvc0: disable linked tsc mode in compute launch descriptor
Empirically, this makes things work. Presumably this was originally
copied from the blob, which does make use of linked tsc mode.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99532
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 956556b3c30ce3d38d0af795f9383df3bc2cf8a2)
diff --git a/src/gallium/drivers/nouveau/nvc0/nve4_compute.c b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
index d661c00..15b4750 100644
--- a/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
+++ b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
@@ -816,6 +816,7 @@ nve4_compute_dump_launch_desc(const struct nve4_cp_launch_desc *desc)
debug_printf("barrier count: %u\n", desc->bar_alloc);
debug_printf("$r count: %u\n", desc->gpr_alloc);
debug_printf("cache split: %s\n", nve4_cache_split_name(desc->cache_split));
+ debug_printf("linked tsc: %d\n", desc->linked_tsc);
for (i = 0; i < 8; ++i) {
uint64_t address;
diff --git a/src/gallium/drivers/nouveau/nvc0/nve4_compute.h b/src/gallium/drivers/nouveau/nvc0/nve4_compute.h
index b98c65d..5fe58b9 100644
--- a/src/gallium/drivers/nouveau/nvc0/nve4_compute.h
+++ b/src/gallium/drivers/nouveau/nvc0/nve4_compute.h
@@ -8,7 +8,10 @@ struct nve4_cp_launch_desc
{
u32 unk0[8];
u32 entry;
- u32 unk9[3];
+ u32 unk9[2];
+ u32 unk11_0 : 30;
+ u32 linked_tsc : 1;
+ u32 unk11_31 : 1;
u32 griddim_x : 31;
u32 unk12 : 1;
u16 griddim_y;
@@ -48,7 +51,7 @@ nve4_cp_launch_desc_init_default(struct nve4_cp_launch_desc *desc)
memset(desc, 0, sizeof(*desc));
desc->unk0[7] = 0xbc000000;
- desc->unk9[2] = 0x44014000;
+ desc->unk11_0 = 0x04014000;
desc->unk47_20 = 0x300;
}
commit 9f669540479768c28557ace2f5aef2025ba70b0a
Author: Bartosz Tomczyk <bartosz.tomczyk86@gmail.com>
Date: Sun Jan 29 19:10:25 2017 +0100
r600/sb: Fix memory leak
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
(cherry picked from commit 94262e5f5db1f5c7865ced251c440bc5f3f4a89d)
Fixes: e933246013ee ("r600/sb: Fix loop optimization related hangs on eg")
Nominated-by: Andreas Boll <andreas.boll.dev@gmail.com>
diff --git a/src/gallium/drivers/r600/sb/sb_valtable.cpp b/src/gallium/drivers/r600/sb/sb_valtable.cpp
index a8b7b49..d31a1b7 100644
--- a/src/gallium/drivers/r600/sb/sb_valtable.cpp
+++ b/src/gallium/drivers/r600/sb/sb_valtable.cpp
@@ -241,6 +241,7 @@ void value::remove_use(const node *n) {
{
// TODO assert((*it)->kind == kind) ?
// TODO assert((*it)->arg == arg) ?
+ delete *it;
uses.erase(it);
}
}
@@ -290,7 +291,12 @@ bool value::is_prealloc() {
}
void value::delete_uses() {
- uses.erase(uses.begin(), uses.end());
+ for (uselist::iterator it = uses.begin(); it != uses.end(); ++it)
+ {
+ delete *it;
+ }
+
+ uses.clear();
}
void ra_constraint::update_values() {
commit bebf672fc76cc306e95b98444066ea8299754704
Author: Derek Foreman <derekf@osg.samsung.com>
Date: Tue Jan 10 15:21:47 2017 -0600
egl/dri2: add image_loader_extension back into loader extensions for wayland
before commit f871946594129500a67c05a6d9fe99db54b4bb64
image_loader_extension was always present in dri2_dpy->extensions,
after that commit it is only present for render nodes.
Its removal broke partial render based on buffer age on (at least)
raspberry pi.
Fixes: f8719465941 "egl/dri2: rework dri2_egl_display::extensions storage"
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 534ea2b5ba0282a350dc02d21bfbc8ffa1f8635d)
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 5b72b4a..27baec3 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1081,6 +1081,7 @@ static struct dri2_egl_display_vtbl dri2_wl_display_vtbl = {
static const __DRIextension *dri2_loader_extensions[] = {
&dri2_loader_extension.base,
+ &image_loader_extension.base,
&image_lookup_extension.base,
&use_invalidate.base,
NULL,
commit 1b0715f05f2885a84aafb0c6241f052e15c402fa
Author: Vinson Lee <vlee@freedesktop.org>
Date: Sun Nov 13 22:53:54 2016 -0800
util: Fix Clang trivial destructor check.
Check for Clang before GCC.
Clang defines __GNUC__ == 4 and __GNUC_MINOR__ == 2 and matches the GCC
check but not the GCC version for trivial destructor.
Fixes: 98ab905af0e0 ("mesa: Define introspection macro to determine
whether a type is trivially destructible.")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98526
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
(cherry picked from commit ed6694d5114e81cf1c413aec8265ddc8a5c52599)
diff --git a/src/util/macros.h b/src/util/macros.h
index 27d1b62..efb896f 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -167,12 +167,12 @@ do { \
* performs no action and all member variables and base classes are
* trivially destructible themselves.
*/
-# if defined(__GNUC__)
-# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+# if (defined(__clang__) && defined(__has_feature))
+# if __has_feature(has_trivial_destructor)
# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
# endif
-# elif (defined(__clang__) && defined(__has_feature))
-# if __has_feature(has_trivial_destructor)
+# elif defined(__GNUC__)
+# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
# endif
# endif
commit 06b96072c7ffed51854b6ca18bf74da61c2a6d43
Author: Vinson Lee <vlee@freedesktop.org>
Date: Mon Oct 24 16:33:01 2016 -0700
scons: Require libdrm >= 2.4.66 for DRM.
configure.ac already requires 2.4.66.
Fix SCons build. drmDevicePtr is not available until libdrm 2.4.65.
Compiling src/loader/loader.c ...
src/loader/loader.c:111:40: error: unknown type name ‘drmDevicePtr’
static char *drm_construct_id_path_tag(drmDevicePtr device)
^
Fixes: 4a183f4d06f8 ("scons: loader: use libdrm when available")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98421
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Vedran Miletić <vedran@miletic.net>
(cherry picked from commit f2770fb3d5e7a4a456f8f14726f72a1e37496419)
diff --git a/scons/gallium.py b/scons/gallium.py
index 9f7555c..dc7fdce 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -651,7 +651,7 @@ def generate(env):
env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes', 'glproto >= 1.4.13'])
env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx >= 1.8.1', 'xcb-dri2 >= 1.8'])
env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
- env.PkgCheckModules('DRM', ['libdrm >= 2.4.38'])
+ env.PkgCheckModules('DRM', ['libdrm >= 2.4.66'])
if env['x11']:
env.Append(CPPPATH = env['X11_CPPPATH'])
commit 2248d245090032fc8123d9e2be2da150ac295f76
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Sat Feb 11 16:47:56 2017 +0000
bin/get-fixes-pick-list.sh: add new script
The script parses the "Fixes" tags and nominates respective commit if
applicable.
Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit 389478c4e904f5d2c82485e56bdcb0195f1850d0)
diff --git a/bin/get-fixes-pick-list.sh b/bin/get-fixes-pick-list.sh
new file mode 100755
index 0000000..4ce9c92
--- /dev/null
+++ b/bin/get-fixes-pick-list.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Script for generating a list of candidates [referenced by a Fixes tag] for
+# cherry-picking to a stable branch
+#
+# Usage examples:
+#
+# $ bin/get-fixes-pick-list.sh
+# $ bin/get-fixes-pick-list.sh > picklist
+# $ bin/get-fixes-pick-list.sh | tee picklist
+
+# Use the last branchpoint as our limit for the search
+latest_branchpoint=`git merge-base origin/master HEAD`
+
+# List all the commits between day 1 and the branch point...
+git log --reverse --pretty=%H $latest_branchpoint > already_landed
+
+# ... and the ones cherry-picked.
+git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
+ grep "cherry picked from commit" |\
+ sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
+
+# Grep for commits with Fixes tag
+git log --reverse --pretty=%H -i --grep="fixes:" $latest_branchpoint..origin/master |\
+while read sha
+do
+ # For each one try to extract the tag
+ fixes_count=`git show $sha | grep -i "fixes:" | wc -l`
+ if [ "x$fixes_count" != x1 ] ; then
+ echo WARNING: Commit $sha has nore than one Fixes tag
+ fi
+ fixes=`git show $sha | grep -i "fixes:" | head -n 1`
+ # The following sed/cut combination is borrowed from GregKH
+ id=`echo ${fixes} | sed -e 's/^[ \t]*//' | cut -f 2 -d ':' | sed -e 's/^[ \t]*//' | cut -f 1 -d ' '`
+
+ # Bail out if we cannot find suitable id.
+ # Any specific validation the $id is valid and not some junk, is
+ # implied with the follow up code
+ if [ "x$id" = x ] ; then
+ continue
+ fi
+
+ # Check if the offending commit is in branch.
+
+ # Be that cherry-picked ...
+ # ... or landed before the branchpoint.
+ if grep -q ^$id already_picked ||
+ grep -q ^$id already_landed ; then
+
+ # Finally nominate the fix if it hasn't landed yet.
+ if grep -q ^$sha already_picked ; then
+ continue
+ fi
+
+ echo Commit $sha fixes $id
+ fi
+
+done
+
+rm -f already_picked
+rm -f already_landed
commit 32cf2344c12a97c9d2531209c1b9ce1a641e6cf0
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 13 01:37:55 2017 +0000
bin/get-pick-list.sh: remove ancient way of nominating patches
The old way of nominating patches [NOTE: .*[Cc]andidate] was
deprecated and has been unused for approx. 3 years.
Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit f1b0b75099c7bdcc1a96ffcf9505e255ab57ee4c)
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 597dd70..8b1e00f 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -17,7 +17,7 @@ git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*13\.0.*mesa-stable\)' $latest_branchpoint..origin/master |\
+git log --reverse --pretty=%H -i --grep='^CC:.*13\.0.*mesa-stable' $latest_branchpoint..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
commit a05089106ba482fa8d47fcc25d94e9016a8f1135
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 13 00:37:03 2017 +0000
bin/get-pick-list.sh: limit `git grep ...' only as needed
Analogous to previous commit.
Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit d6b1d11d4f58c3934a75446cfdf415407e65b3af)
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 98bf692..597dd70 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -8,13 +8,16 @@
# $ bin/get-pick-list.sh > picklist
# $ bin/get-pick-list.sh | tee picklist
+# Use the last branchpoint as our limit for the search
+latest_branchpoint=`git merge-base origin/master HEAD`
+
# Grep for commits with "cherry picked from commit" in the commit message.
-git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
+git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
grep "cherry picked from commit" |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*13\.0.*mesa-stable\)' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*13\.0.*mesa-stable\)' $latest_branchpoint..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
commit dfe79fc3f111fc88036b35b86a69df8d8ca0d669
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 13 00:32:21 2017 +0000
bin/get-typod-pick-list.sh: limit `git grep ...' to only as needed
The currently used range HEAD..origin/master is far too broad. It looks
for nominations within the already_landed list (branchpoint..HEAD).
Similarly we look for already_landed whiting the [possible] nominations
Rand branchpoint..origin/master.
Improve things by limiting the look ups to the branch point.
Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit d292f12d94b0a940e4534451f62d5afed812374b)
diff --git a/bin/get-typod-pick-list.sh b/bin/get-typod-pick-list.sh
index 2fe3d89..eb4181d 100755
--- a/bin/get-typod-pick-list.sh
+++ b/bin/get-typod-pick-list.sh
@@ -12,13 +12,16 @@
# This script intentionally _never_ checks for specific version tag
# Should we consider folding it with the original get-pick-list.sh
+# Use the last branchpoint as our limit for the search
+latest_branchpoint=`git merge-base origin/master HEAD`
+
# Grep for commits with "cherry picked from commit" in the commit message.
-git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
+git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
grep "cherry picked from commit" |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^CC:.*mesa-dev' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^CC:.*mesa-dev' $latest_branchpoint..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
commit dad81f4cd02ebb9102e75291a9998d6233011f4f
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Sat Feb 11 12:45:21 2017 +0000
bin/get-extra-pick-list: rework to use already_picked list
Currently we loop (git log --grep) to check if the fix has landed. We
can simplify and make things faster by storing the already_picked list
and grep ping through it.
Slim down the message while we're here.
Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit 71e00d62ed2228a773a4f5abff98a16961e7f21c)
diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
index f292d3e..4d39389 100755
--- a/bin/get-extra-pick-list.sh
+++ b/bin/get-extra-pick-list.sh
@@ -15,20 +15,23 @@ latest_branchpoint=`git merge-base origin/master HEAD`
# Grep for commits with "cherry picked from commit" in the commit message.
git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
grep "cherry picked from commit" |\
- sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' |\
- cut -c -8 |\
+ sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
+
+# For each cherry-picked commit...
+cat already_picked | cut -c -8 |\
while read sha
do
- # Check if the original commit is referenced in master
+ # ... check if it's referenced (fixed by another) patch
git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\
cut -c -8 |\
while read candidate
do
- # Check if the potential fix, hasn't landed in branch yet.
- found=`git log -n1 --pretty=oneline --reverse --grep=$candidate $latest_branchpoint..HEAD |wc -l`
- if test $found = 0
- then
- echo Commit $candidate might need to be picked, as it references $sha
+ # And flag up if it hasn't landed in branch yet.
+ if grep -q ^$candidate already_picked ; then
+ continue
fi
+ echo Commit $candidate references $sha
done
done
+
+rm -f already_picked
commit 61d7a9dc21df111440079afc8da2f26da59eb369
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 13 00:13:55 2017 +0000
bin/get-extra-pick-list: use git merge-base to get the branchpoint
Since mesa development history is linear and the only diversion is at
the branchpoint. Thus we can drop the ad-hoc parsing and use git
merge-base to retrieve it.
Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit cb1947eac70f63d78835a5442017b1f3b7099d77)
diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
index a9d25b9..f292d3e 100755
--- a/bin/get-extra-pick-list.sh
+++ b/bin/get-extra-pick-list.sh
@@ -10,8 +10,7 @@
# $ bin/get-extra-pick-list.sh | tee picklist
# Use the last branchpoint as our limit for the search
-# XXX: there should be a better way for this
-latest_branchpoint=`git branch | grep \* | cut -c 3-`-branchpoint
+latest_branchpoint=`git merge-base origin/master HEAD`
# Grep for commits with "cherry picked from commit" in the commit message.
git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
commit 279604b4fa36f0a7a8947a14dff60cd5644ffb74
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Feb 6 12:13:17 2017 +0100
glx/glvnd: Fix GLXdispatchIndex sorting
Commit 8bca8d89ef3b ("glx/glvnd: Fix dispatch function names and indices")
fixed the sorting of the array initializers in g_glxglvnddispatchfuncs.c
because FindGLXFunction's binary search needs these to be sorted
alphabetically.
That commit also mostly fixed the sorting of the DI_foo defines in
g_glxglvnddispatchindices.h, which is what actually matters as the
arrays are initialized using "[DI_foo] = glXfoo," but a small error
crept in which at least causes glXGetVisualFromFBConfigSGIX to not
resolve, breaking games such as "The Binding of Isaac: Rebirth" and
"Crypt of the NecroDancer" from Steam not working and possible causes
other problems too.
This commit fixes the last of the sorting errors, fixing these mentioned
games not working.
Fixes: 8bca8d89ef3b ("glx/glvnd: Fix dispatch function names and indices")
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
Cc: "17.0" <mesa-stable@lists.freedesktop.org>
Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit 4c66f529a8ea4cc7589c1e3760894793c666e9b2)
diff --git a/src/glx/g_glxglvnddispatchindices.h b/src/glx/g_glxglvnddispatchindices.h
index 0891654..05a2c8c 100644
--- a/src/glx/g_glxglvnddispatchindices.h
+++ b/src/glx/g_glxglvnddispatchindices.h
@@ -46,14 +46,14 @@ typedef enum __GLXdispatchIndex {
DI_GetMscRateOML,
// GetProcAddress implemented by libglvnd
// GetProcAddressARB implemented by libglvnd
+ DI_GetScreenDriver,
// GetSelectedEvent implemented by libglvnd
DI_GetSelectedEventSGIX,
+ DI_GetSwapIntervalMESA,
+ DI_GetSyncValuesOML,
DI_GetVideoSyncSGI,
// GetVisualFromFBConfig implemented by libglvnd
DI_GetVisualFromFBConfigSGIX,
- DI_GetScreenDriver,
- DI_GetSwapIntervalMESA,
- DI_GetSyncValuesOML,
// ImportContextEXT implemented by libglvnd
// IsDirect implemented by libglvnd
DI_JoinSwapGroupSGIX,
@@ -81,9 +81,9 @@ typedef enum __GLXdispatchIndex {
DI_SwapIntervalMESA,
DI_SwapIntervalSGI,
// UseXFont implemented by libglvnd
Reply to: