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

New commits:
commit 550f815d538542dcddbc11a02e30c36cc85aaeac
Author: Timo Aaltonen <tjaal...@debian.org>
Date:   Fri Sep 16 10:12:26 2016 +0300

    upload to yak

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

commit 86dadc2a87a40878b35e9785a604dfcb4ff6fb3d
Author: Timo Aaltonen <tjaal...@debian.org>
Date:   Fri Sep 16 10:11:09 2016 +0300

    update changelog

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

commit faf019854c61f38825a66646f2dec1e4a9c83659
Author: Andreas Boll <andreas.boll....@gmail.com>
Date:   Thu Sep 15 13:38:58 2016 +0200

    Upload to unstable.

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

commit 8c0b6f98962ff261c1914c91bcb28750eaf7fcff
Author: Andreas Boll <andreas.boll....@gmail.com>
Date:   Thu Sep 8 11:31:40 2016 +0200

    Enable vc4 on arm64.

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

commit dcf808a86dca081492ceac7aafcdd81564711323
Author: Andreas Boll <andreas.boll....@gmail.com>
Date:   Thu Sep 15 12:44:38 2016 +0200

    Bump changelog

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

commit d79b2e7bf30ad6d1fa43f30940a64ed9fd0aa9c0
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Sep 15 10:18:54 2016 +0100

    docs: add release notes for 12.0.3
    
    Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

diff --git a/docs/relnotes/12.0.3.html b/docs/relnotes/12.0.3.html
new file mode 100644
index 0000000..cc59a01
--- /dev/null
+++ b/docs/relnotes/12.0.3.html
@@ -0,0 +1,70 @@
+<!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 12.0.3 Release Notes / September 15, 2016</h1>
+
+<p>
+Mesa 12.0.3 is a bug fix release which fixes bugs found since the 12.0.3 
release.
+</p>
+<p>
+Mesa 12.0.3 implements the OpenGL 4.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.3.  OpenGL
+4.3 is <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>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97781";>Bug 97781</a> 
- [HSW, BYT, IVB] 
es2-cts.gtf.gl2extensiontests.depth_texture_cube_map.depth_texture_cube_map</li>
+
+</ul>
+
+
+<h2>Changes</h2>
+
+<p>Emil Velikov (3):</p>
+<ul>
+  <li>docs: add sha256 checksums for 12.0.2</li>
+  <li>Revert "i965/miptree: Stop multiplying cube depth by 6 in HiZ 
calculations"</li>
+  <li>Update version to 12.0.3</li>
+</ul>
+
+<p>José Fonseca (1):</p>
+<ul>
+  <li>appveyor: Update winflexbison download URL.</li>
+</ul>
+
+
+</div>
+</body>
+</html>

commit e487048f8c56cd21f19b6d4fdeb8a8e39db2c25e
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Sep 15 10:15:57 2016 +0100

    Update version to 12.0.3
    
    Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

diff --git a/VERSION b/VERSION
index f36e00a..470ce40 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.0.2
+12.0.3

commit 71b47b9cfe50b32de10a4c0fd6a6ea77f0de3c7f
Author: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Tue Sep 13 20:06:30 2016 +0100

    Revert "i965/miptree: Stop multiplying cube depth by 6 in HiZ calculations"
    
    This reverts commit be0344f63046be7acd56f567f6ff4509f8bd1a8d.
    
    The commit depends on 48e9ecc47f0 ("Revert "i965/miptree: Set
    logical_depth0 == 6 for cube maps") which was reverted earlier.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97781

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c 
b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index c234f24..e74a2dc 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1789,8 +1789,14 @@ intel_gen7_hiz_buf_create(struct brw_context *brw,
       hz_height = DIV_ROUND_UP(hz_height, 2);
    } else {
       const unsigned hz_qpitch = h0 + h1 + (12 * vertical_align);
-      /* HZ_Height (rows) = Ceiling ( ( Q_pitch * Z_depth/2) /8 ) * 8 */
-      hz_height = DIV_ROUND_UP(hz_qpitch * Z0, 2 * 8) * 8;
+      if (mt->target == GL_TEXTURE_CUBE_MAP_ARRAY ||
+          mt->target == GL_TEXTURE_CUBE_MAP) {
+         /* HZ_Height (rows) = Ceiling ( ( Q_pitch * Z_depth * 6/2) /8 ) * 8 */
+         hz_height = DIV_ROUND_UP(hz_qpitch * Z0 * 6, 2 * 8) * 8;
+      } else {
+         /* HZ_Height (rows) = Ceiling ( ( Q_pitch * Z_depth/2) /8 ) * 8 */
+         hz_height = DIV_ROUND_UP(hz_qpitch * Z0, 2 * 8) * 8;
+      }
    }
 
    unsigned long pitch;
@@ -1887,6 +1893,15 @@ intel_gen8_hiz_buf_create(struct brw_context *brw,
    } else {
       /* HZ_Height (rows) = ceiling( (HZ_QPitch/2)/8) *8 * Z_Depth */
       hz_height = DIV_ROUND_UP(buf->qpitch, 2 * 8) * 8 * Z0;
+      if (mt->target == GL_TEXTURE_CUBE_MAP_ARRAY ||
+          mt->target == GL_TEXTURE_CUBE_MAP) {
+         /* HZ_Height (rows) = ceiling( (HZ_QPitch/2)/8) *8 * 6 * Z_Depth
+          *
+          * We can can just take our hz_height calculation from above, and
+          * multiply by 6 for the cube map and cube map array types.
+          */
+         hz_height *= 6;
+      }
    }
 
    unsigned long pitch;

commit bde8f418bd2166849c971e416c3941ce115b2a1c
Author: Jose Fonseca <jfons...@vmware.com>
Date:   Tue Sep 13 17:53:30 2016 +0100

    appveyor: Update winflexbison download URL.
    
    This particular version got moved into a `old_versions` subdirectory.

diff --git a/appveyor.yml b/appveyor.yml
index c2efa7e..6e69cbf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -55,7 +55,7 @@ install:
 - python -m pip install --egg scons==2.4.1
 - scons --version
 # Install flex/bison
-- if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile 
"http://downloads.sourceforge.net/project/winflexbison/%WINFLEXBISON_ARCHIVE%";
+- if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile 
"https://downloads.sourceforge.net/project/winflexbison/old_versions/%WINFLEXBISON_ARCHIVE%";
 - 7z x -y -owinflexbison\ "%WINFLEXBISON_ARCHIVE%" > nul
 - set Path=%CD%\winflexbison;%Path%
 - win_flex --version

commit 614fb93a6d0246d5592333a1b914ce71a409fcf7
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Sep 5 16:03:06 2016 +0100

    docs: add sha256 checksums for 12.0.2
    
    Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

diff --git a/docs/relnotes/12.0.2.html b/docs/relnotes/12.0.2.html
index 6745342..385ef08 100644
--- a/docs/relnotes/12.0.2.html
+++ b/docs/relnotes/12.0.2.html
@@ -31,7 +31,8 @@ because compatibility contexts are not supported.
 
 <h2>SHA256 checksums</h2>
 <pre>
-TBD
+a08565ab1273751ebe2ffa928cbf785056594c803077c9719d0763da780f2918  
mesa-12.0.2.tar.gz
+d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb  
mesa-12.0.2.tar.xz
 </pre>
 
 

Reply via email to