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..0000000
--- 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
commit b30faf44e042348cab5016605bcb19ca77dd81f7
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 15 11:42:40 2014 +0200
release to experimental
diff --git a/debian/changelog b/debian/changelog
index f2bbad1..d3d6435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
+mesa (10.3.0~rc3-2) experimental; urgency=medium
[ Andreas Boll ]
* Add 01_gallium-util-add-missing-u_debug-include.patch, fixes FTBFS on
@@ -9,7 +9,7 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
[ Fabio Pedretti ]
* debian/rules: minor cleanup.
- -- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 15 Sep 2014
11:01:55 +0200
mesa (10.3.0~rc3-1) experimental; urgency=medium
commit ceae058561ef101e0c2a31b2137ce191de76fc1f
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 15 10:57:56 2014 +0200
Revert "debian/rules: enable intel ilo gallium driver"
This reverts commit 3acf10d5b31f9a4ea9f96f05b445f90d5417f368.
diff --git a/debian/changelog b/debian/changelog
index 4aa9e6f..f2bbad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
* Don't try to install vdpau hardlinks on hurd, should fix FTBFS.
[ Fabio Pedretti ]
- * debian/rules: enable intel ilo gallium driver.
* debian/rules: minor cleanup.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
diff --git a/debian/rules b/debian/rules
index f27d994..ca4033c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,6 @@ else
# Build intel drivers on archs where libdrm-intel is installed
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
x32))
DRI_DRIVERS += i915 i965
- GALLIUM_DRIVERS += ilo
endif
# Do not build llvmpipe for armhf, it regresses compared to the classic
swrast.
commit 0ffbbf50ef7c8d86dd772621d6461c6fd662cc4c
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 15 10:57:54 2014 +0200
Revert "Close bug #732635"
This reverts commit b2d8afb29015a6ae4b3687d450a3763d489c7c7d.
diff --git a/debian/changelog b/debian/changelog
index 9786985..4aa9e6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
* Don't try to install vdpau hardlinks on hurd, should fix FTBFS.
[ Fabio Pedretti ]
- * debian/rules: enable intel ilo gallium driver (Closes: #732635).
+ * debian/rules: enable intel ilo gallium driver.
* debian/rules: minor cleanup.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
commit b2d8afb29015a6ae4b3687d450a3763d489c7c7d
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Sep 12 15:10:02 2014 +0200
Close bug #732635
diff --git a/debian/changelog b/debian/changelog
index 4aa9e6f..9786985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
* Don't try to install vdpau hardlinks on hurd, should fix FTBFS.
[ Fabio Pedretti ]
- * debian/rules: enable intel ilo gallium driver.
+ * debian/rules: enable intel ilo gallium driver (Closes: #732635).
* debian/rules: minor cleanup.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
commit 025c06de6274dbdfd873ac1e124eaf22f7f0cf19
Author: Fabio Pedretti <fabio....@libero.it>
Date: Fri Sep 12 11:59:36 2014 +0200
debian/rules: minor cleanup
Signed-off-by: Andreas Boll <andreas.boll....@gmail.com>
diff --git a/debian/changelog b/debian/changelog
index ec4de21..4aa9e6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
[ Fabio Pedretti ]
* debian/rules: enable intel ilo gallium driver.
+ * debian/rules: minor cleanup.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
diff --git a/debian/rules b/debian/rules
index e55fffc..f27d994 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,6 +138,7 @@ confflags-dri = \
--enable-shared-glapi \
--enable-texture-float \
--disable-xvmc \
+ --disable-omx \
$(confflags_DIRECT_RENDERING) \
$(confflags_DRI3) \
$(confflags_EGL) \
@@ -175,8 +176,6 @@ confflags-swx11-i386-i686 = \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
$(buildflags-i686)
-confflags += --disable-omx
-
configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
commit 3acf10d5b31f9a4ea9f96f05b445f90d5417f368
Author: Fabio Pedretti <fabio....@libero.it>
Date: Fri Sep 12 11:59:35 2014 +0200
debian/rules: enable intel ilo gallium driver
Can be enabled adding this in /etc/X11/xorg.conf:
Section "Device"
Identifier "Device0"
Driver "Intel"
Option "DRI" "ilo"
EndSection
v2 (Andreas): Enable ilo on kfreebsd-* too
Signed-off-by: Andreas Boll <andreas.boll....@gmail.com>
diff --git a/debian/changelog b/debian/changelog
index 3bfdf0f..ec4de21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* Add 01_gallium-util-add-missing-u_debug-include.patch, fixes FTBFS on
big endian archs.
* Enable --with-egl-platforms=drm on kfreebsd-any, should fix FTBFS.
* Don't try to install vdpau hardlinks on hurd, should fix FTBFS.
+ [ Fabio Pedretti ]
+ * debian/rules: enable intel ilo gallium driver.
+
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
mesa (10.3.0~rc3-1) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index 3606e47..e55fffc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,7 @@ else
# Build intel drivers on archs where libdrm-intel is installed
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
x32))
DRI_DRIVERS += i915 i965
+ GALLIUM_DRIVERS += ilo
endif
# Do not build llvmpipe for armhf, it regresses compared to the classic
swrast.
commit c25a50e5dd84456cc4ce2cb406ccda00df5a6c18
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Sep 12 11:28:57 2014 +0200
Don't try to install vdpau hardlinks on hurd
Should fix FTBFS.
diff --git a/debian/changelog b/debian/changelog
index 5da7e76..3bfdf0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
* Add 01_gallium-util-add-missing-u_debug-include.patch, fixes FTBFS on
big endian archs.
* Enable --with-egl-platforms=drm on kfreebsd-any, should fix FTBFS.
+ * Don't try to install vdpau hardlinks on hurd, should fix FTBFS.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
diff --git a/debian/rules b/debian/rules
index 66b6845..3606e47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -279,10 +279,12 @@ binary-arch: install
mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
+ ifneq ($(DEB_HOST_ARCH_OS), hurd)
# Copy the hardlinked vdpau drivers correctly.
install -m755 -d
debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
+ endif
dh_install -s --fail-missing
dh_installman -s
commit c42909269c29cf25a5e1143fd24c3806ee3c6acf
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Sep 12 10:44:33 2014 +0200
Enable --with-egl-platforms=drm on kfreebsd-any
Should fix FTBFS.
diff --git a/debian/changelog b/debian/changelog
index bfa5e4e..5da7e76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
* Add 01_gallium-util-add-missing-u_debug-include.patch, fixes FTBFS on
big endian archs.
+ * Enable --with-egl-platforms=drm on kfreebsd-any, should fix FTBFS.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
diff --git a/debian/rules b/debian/rules
index 74568e2..66b6845 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,10 +78,7 @@ else
# svga needs xa state tracker
confflags_GALLIUM += --enable-xa
-#
-# Although the KMS egl drivers will probably build on kfreebsd & hurd
-# only linux actually has KMS drivers implemented at this point.
- EGL_DISPLAYS += drm
+
# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
EGL_DISPLAYS += wayland
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
@@ -89,6 +86,8 @@ else
endif
endif
+ EGL_DISPLAYS += drm
+
# Build intel drivers on archs where libdrm-intel is installed
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
x32))
DRI_DRIVERS += i915 i965
commit 1c88709ecc6c4b160ccb247641910434c8b132cc
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Sep 12 10:37:57 2014 +0200
Add 01_gallium-util-add-missing-u_debug-include.patch
Fixes FTBFS on big endian archs.
diff --git a/debian/changelog b/debian/changelog
index 76cf8a6..bfa5e4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.3.0~rc3-2) UNRELEASED; urgency=medium
+
+ * Add 01_gallium-util-add-missing-u_debug-include.patch, fixes FTBFS on
+ big endian archs.
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Fri, 12 Sep 2014 10:34:19 +0200
+
mesa (10.3.0~rc3-1) experimental; urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/patches/01_gallium-util-add-missing-u_debug-include.patch
b/debian/patches/01_gallium-util-add-missing-u_debug-include.patch
new file mode 100644
index 0000000..12ed857
--- /dev/null
+++ b/debian/patches/01_gallium-util-add-missing-u_debug-include.patch
@@ -0,0 +1,39 @@
+From 05bd91b0202e06cab998112a3a833c1fa3b47d31 Mon Sep 17 00:00:00 2001
+From: Andreas Boll <andreas.boll....@gmail.com>
+Date: Fri, 12 Sep 2014 10:11:24 +0200
+Subject: [PATCH] gallium/util: add missing u_debug include
+
+Needed for assert.
+Fixes build on BE archs with -Werror=implicit-function-declaration.
+
+In file included from
+../../../../../src/gallium/auxiliary/draw/draw_fs.c:30:0:
+../../../../../src/gallium/auxiliary/util/u_math.h: In function
+'util_memcpy_cpu_to_le32':
+../../../../../src/gallium/auxiliary/util/u_math.h:810:4: error:
+implicit declaration of function 'assert'
+[-Werror=implicit-function-declaration]
+ assert(n % 4 == 0);
+ ^
+
+Cc: "10.3" <mesa-sta...@lists.freedesktop.org>
+Signed-off-by: Andreas Boll <andreas.boll....@gmail.com>
+---
+ src/gallium/auxiliary/util/u_math.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gallium/auxiliary/util/u_math.h
b/src/gallium/auxiliary/util/u_math.h
+index 25bcfb5..39bd40f 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 "util/u_debug.h"
+
+
+ #ifdef __cplusplus
+--
+2.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 9f0749f..2274a62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_gallium-util-add-missing-u_debug-include.patch
07_gallium-fix-build-failure-on-powerpcspe.diff
commit 21df3116dde1f1007db142aaa84792319cb47d4c
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 8 15:51:05 2014 +0200
release to experimental
diff --git a/debian/changelog b/debian/changelog
index cb2e48d..76cf8a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.3.0~rc3-1) UNRELEASED; urgency=low
+mesa (10.3.0~rc3-1) experimental; urgency=medium
[ Maarten Lankhorst ]
* Build with llvm 3.5.
@@ -9,7 +9,7 @@ mesa (10.3.0~rc3-1) UNRELEASED; urgency=low
* mesa-common-dev: Add glcorearb.h.
* not-installed: Skip libglapi.so.
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 12 Aug 2014
09:38:49 +0200
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 08 Sep 2014
15:50:42 +0200
mesa (10.2.5-1) unstable; urgency=medium
commit ea6a35dd882ed2630e0fca5ba1c6303bc0313a2d
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 8 15:26:52 2014 +0200
add xexaxo's key to allowed signatures
Matches the tag downloaded through ssh from fd.org.
I have no idea if it's the real one or not, but it matches the tarball.
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 529e6c5..360f6c8 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -587,3 +587,32 @@
STu6wy2ZfNz1G8MKoYTavqyjYKTJBi3ZuSllxBY973CaRe5uU2WhJcBlkHv3Qut6
/r0Jac/UieMLDFX8ixH7ooSevqX8sSA4UbVuUaOXVr0awYUCvD0d
=LxfO
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFQDrA8BEACyGXUc6vSmNkwZdTTzX1vHRgIDWoppot56E5oOO+gM6ukyMDY7
+60FxKvmh704I8NqTfg3Rcs18fSOXeRj1gDG84MsU7QM3g6IQyxCA+IV7d2r/DPZE
+z7HxEIKFxGJw24swsQJy/iiZf/b8flqiJbx3Ye1LF7T5iw/gKDsN6eqzAtLKqw9I
+/4TBVE766nwmKNQZiw2jAFCs3lwfmNIm7ZaQNBpHTRabMTLMJiFFynLsa1eVsf9D
+R3eVXW4c2oHKZbxDvSWR2yz6XcQ9ldii89sUNeclnjSFNOt761P4zBNwcEX2GuQs
+JO/haw5FyrMJJexAbdUTtshZ7XvhDv/UCHtyqQBUw/vwYe8Rx79Hq/fOOUdMjWOW
+cDCzyYTmGdbEJYRHrENcsOhoti3IkOjgzw0UDyCHyjapFV1ZJT/Kz7rkMmsdNtoi
+1BVTLIdOvQmeXQtN2caZSN20wZWHdZnrz1/JOfOxpEsf2R78zavIfobReQdFoYMC
+jv4b49WB/Gytd5vneqk9yi9DEhCYw5uGxQgjIKC4AZPVtD//GY+iYiPe5dPwrhU1
+FyD3b9SgYxFE/uZlgbzBIV4akK11vC5Q+Co5PYzhnPPgd7cYLjr/ceMfGPkeWLCY
+OxZbXg92BZKKJnFHYx7FJ04WKS8SjzIn/qEzvy7SmPGxSCX6zdwn0fKZYQARAQAB
+tCdFbWlsIFZlbGlrb3YgPGVtaWwubC52ZWxpa292QGdtYWlsLmNvbT6JAjkEEwEC
+ACMFAlQDrA8CGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDtrjewLOtJ
+DV/AEACd/RKvSzL0L4/9HYvFskjNR40NPFyQHyMaPg9eeblhfbnH7mWYXJ2MPGTR
+bgvQCr0zZ3R7u8E8Rxulwifbm20x0WhYOKkDuSROjroRqvDhxfuLtXtBKqfVGw6T
+0rMEOOWdqGhql4yuVpqGbgHa5ZfFvQi2EtT40QDdD052adzWeT96aFQB6Gf3CRMf
+a4y7hawbUV10XL3BUljUcyh+SJv9lPclW09WNE+tuCmdIqoP927BSjXwh2GR6dM0
+z0aDf3wOxRc9S8q34jS+xN8hsXmYFAqkn0YkVIQ0M0PaQ89ltcyonbG6rZ+1rNgx
+tiLEpfOZpzr7LowVsw9R6ky/pvhBHfVIM4aT17hbi2XfnMihmt/T1SZqb36+aYFt
+j8Bc/o9I5crPXwOP4in3heY2ZmDWeGkPSRNix0VLQHL0HzOxjMAEm+y5ROLDo7Z/
+sGOebYxMYPIK5mJzrKhk737FEI57cvUSRXzbjmV3CIOIJbaNULWFXkCHRhdyk8mh
+sVzKkl7IDiWPBj1RC5r0EXmrjUzK8QfzrTWiOa6z9WIkZ4sSs0bz14Q4pZR2qi8L
+KLVjCNf/FusqCTgbZU06x1S/75XJwcsFENWkWYPEaxxzQiCs1rVzG8SnrOjcyc5F
+T0rEAQLWU7eq9U6nd4BXMkokiuzlOKWqsDyXibR3wkhI80kAJw==
+=XSpT
+-----END PGP PUBLIC KEY BLOCK-----
commit 14204839dd938ae7ca76d2284fdc4e7c58129779
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 8 15:21:10 2014 +0200
bump version
diff --git a/debian/changelog b/debian/changelog
index ae0bbb8..cb2e48d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.3~rc2-1) UNRELEASED; urgency=low
+mesa (10.3.0~rc3-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* Build with llvm 3.5.
commit 4e1ca4a190a0809e3c33327590faaa7eb25812ab
Author: Emil Velikov <emil.l.veli...@gmail.com>
Date: Fri Sep 5 17:00:40 2014 +0100
Increment version to 10.3.0-rc3
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
diff --git a/VERSION b/VERSION
index 87d81b2..babe311 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.3.0-rc2
+10.3.0-rc3
commit 06f1f1ea8106e285a92e873a04de90e3aa228a32
Author: Marek Olšák <marek.ol...@amd.com>
Date: Thu Sep 4 14:38:18 2014 +0200
st/mesa: use 1.0f as boolean true on drivers without integer support
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82882
Cc: 10.2 10.3 mesa-sta...@lists.freedesktop.org
Reviewed-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Matt Turner <matts...@gmail.com>
(cherry picked from commit 1a00f247512f22e58548053a99a706615a178672)
diff --git a/src/mesa/state_tracker/st_extensions.c
b/src/mesa/state_tracker/st_extensions.c
index 4110eb5..914004b 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -34,6 +34,7 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
+#include "util/u_math.h"
#include "st_context.h"
#include "st_extensions.h"
@@ -274,8 +275,6 @@ void st_init_limits(struct pipe_screen *screen,
c->MinProgramTextureGatherOffset = screen->get_param(screen,
PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET);
c->MaxProgramTextureGatherOffset = screen->get_param(screen,
PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET);
- c->UniformBooleanTrue = ~0;
-
c->MaxTransformFeedbackBuffers =
screen->get_param(screen, PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS);
c->MaxTransformFeedbackBuffers = MIN2(c->MaxTransformFeedbackBuffers,
MAX_FEEDBACK_BUFFERS);
@@ -697,6 +696,8 @@ void st_init_extensions(struct pipe_screen *screen,
}
}
+ consts->UniformBooleanTrue = consts->NativeIntegers ? ~0 : fui(1.0f);
+
/* Below are the cases which cannot be moved into tables easily. */
if (!has_lib_dxtc && !options->force_s3tc_enable) {
commit e842a02df3730aaabe7c71dd560c4f0f163ffbc5
Author: Marek Olšák <marek.ol...@amd.com>
Date: Thu Sep 4 15:03:31 2014 +0200
mesa: set UniformBooleanTrue = 1.0f by default
because NativeIntegers is 0 by default.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82882
Cc: 10.2 10.3 mesa-sta...@lists.freedesktop.org
Reviewed-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Matt Turner <matts...@gmail.com>
(cherry picked from commit d67db73458c8d66861b97675660289a9555695ce)
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 2320842..509efd7 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -653,6 +653,9 @@ _mesa_init_constants(struct gl_constants *consts, gl_api
api)
/* GL_ARB_framebuffer_object */
consts->MaxSamples = 0;
+ /* GLSL default if NativeIntegers == FALSE */
+ consts->UniformBooleanTrue = FLT_AS_UINT(1.0f);
+
/* GL_ARB_sync */
consts->MaxServerWaitTimeout = 0x1fff7fffffffULL;
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 0ba658a..2d54ca5 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -184,6 +184,13 @@ static inline GLfloat UINT_AS_FLT(GLuint u)
return tmp.f;
}
+static inline unsigned FLT_AS_UINT(float f)
+{
+ fi_type tmp;
+ tmp.f = f;
+ return tmp.u;
+}
+
/**
* Convert a floating point value to an unsigned fixed point value.
*
commit 96bca3617c3a66462d05a53287ae99940dd940d0
Author: Rob Clark <robcl...@freedesktop.org>
Date: Sat Aug 30 16:51:46 2014 -0400
freedreno/ir3: fix potential null ptr deref
Fix potential segfault in debug code.
Signed-off-by: Rob Clark <robcl...@freedesktop.org>
(cherry picked from commit c06afcede2a0cf214aadc7d4ea149b361ee56ad2)
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_dump.c
b/src/gallium/drivers/freedreno/ir3/ir3_dump.c
index 1a6f49d..6133628 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_dump.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_dump.c
@@ -322,7 +322,8 @@ static void ir3_block_dump(struct ir3_dump_ctx *ctx,
/* draw instruction graph: */
for (i = 0; i < block->noutputs; i++)
- dump_instr(ctx, block->outputs[i]);
+ if (block->outputs[i])
+ dump_instr(ctx, block->outputs[i]);
/* draw outputs: */
fprintf(ctx->f, "output%lx [shape=record,label=\"outputs",
PTRID(block));
commit c221e96a13e89d2dee1dff18e95b7a9f0385d237
Author: Rob Clark <robcl...@freedesktop.org>
Date: Sun Aug 24 13:06:37 2014 -0400
freedreno/a2xx: fix segfault
Signed-off-by: Rob Clark <robcl...@freedesktop.org>
(cherry picked from commit 306e421887720b149be77c749108bcffcebe34f6)
diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_context.c
b/src/gallium/drivers/freedreno/a2xx/fd2_context.c
index f51c5ee..a0bf01f 100644
--- a/src/gallium/drivers/freedreno/a2xx/fd2_context.c
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_context.c
@@ -98,6 +98,7 @@ fd2_context_create(struct pipe_screen *pscreen, void *priv)
pctx = &fd2_ctx->base.base;
fd2_ctx->base.dev = fd_device_ref(screen->dev);
+ fd2_ctx->base.screen = fd_screen(pscreen);
pctx->destroy = fd2_context_destroy;
pctx->create_blend_state = fd2_blend_state_create;
commit 640ddefd9692df695a4ac44381a3a79823eacda6
Author: Rob Clark <robcl...@freedesktop.org>
Date: Sat Aug 23 11:35:31 2014 -0400
freedreno/a3xx: handle first/last level properly
Fixes some assumptions about first_level being zero.
Signed-off-by: Rob Clark <robcl...@freedesktop.org>
(cherry picked from commit bd3b0964675d36e753e273d5667b922cc9baac4a)
diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
index 44932dc..aae8ff1 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
@@ -215,14 +215,19 @@ emit_textures(struct fd_ringbuffer *ring,
OUT_RING(ring, CP_LOAD_STATE_1_STATE_TYPE(ST_CONSTANTS) |
CP_LOAD_STATE_1_EXT_SRC_ADDR(0));
for (i = 0; i < tex->num_textures; i++) {
- static const struct fd3_pipe_sampler_view dummy_view =
{};
+ static const struct fd3_pipe_sampler_view dummy_view = {
+ .base.u.tex.first_level = 1,
+ };
const struct fd3_pipe_sampler_view *view =
tex->textures[i] ?
fd3_pipe_sampler_view(tex->textures[i])
:
&dummy_view;
struct fd_resource *rsc = view->tex_resource;
+ unsigned start = view->base.u.tex.first_level;
+ unsigned end = view->base.u.tex.last_level;
- for (j = 0; j < view->mipaddrs; j++) {
- struct fd_resource_slice *slice =
fd_resource_slice(rsc, j);
+ for (j = 0; j < (end - start + 1); j++) {
+ struct fd_resource_slice *slice =
+ fd_resource_slice(rsc, j +
start);
OUT_RELOC(ring, rsc->bo, slice->offset, 0, 0);
}
diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
index f28919f..b0e5efb 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
@@ -144,7 +144,8 @@ fd3_sampler_view_create(struct pipe_context *pctx, struct
pipe_resource *prsc,
{
struct fd3_pipe_sampler_view *so = CALLOC_STRUCT(fd3_pipe_sampler_view);
struct fd_resource *rsc = fd_resource(prsc);
- unsigned miplevels = cso->u.tex.last_level - cso->u.tex.first_level;
+ unsigned lvl = cso->u.tex.first_level;
+ unsigned miplevels = cso->u.tex.last_level - lvl;
if (!so)
return NULL;
@@ -156,7 +157,6 @@ fd3_sampler_view_create(struct pipe_context *pctx, struct
pipe_resource *prsc,
so->base.context = pctx;
so->tex_resource = rsc;
- so->mipaddrs = 1 + miplevels;
so->texconst0 =
A3XX_TEX_CONST_0_TYPE(tex_type(prsc->target)) |
@@ -170,11 +170,11 @@ fd3_sampler_view_create(struct pipe_context *pctx, struct
pipe_resource *prsc,
so->texconst1 =
A3XX_TEX_CONST_1_FETCHSIZE(fd3_pipe2fetchsize(cso->format)) |
- A3XX_TEX_CONST_1_WIDTH(prsc->width0) |
- A3XX_TEX_CONST_1_HEIGHT(prsc->height0);
+ A3XX_TEX_CONST_1_WIDTH(u_minify(prsc->width0, lvl)) |
+ A3XX_TEX_CONST_1_HEIGHT(u_minify(prsc->height0, lvl));
/* when emitted, A3XX_TEX_CONST_2_INDX() must be OR'd in: */
so->texconst2 =
- A3XX_TEX_CONST_2_PITCH(rsc->slices[0].pitch * rsc->cpp);
+ A3XX_TEX_CONST_2_PITCH(rsc->slices[lvl].pitch *
rsc->cpp);
so->texconst3 = 0x00000000; /* ??? */
return &so->base;
diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
b/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
index f7e5f0e..a83f527 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
@@ -51,7 +51,6 @@ fd3_sampler_stateobj(struct pipe_sampler_state *samp)
struct fd3_pipe_sampler_view {
struct pipe_sampler_view base;
struct fd_resource *tex_resource;
- uint32_t mipaddrs;
uint32_t texconst0, texconst1, texconst2, texconst3;
};
commit 7cd0fa023e996371729a3ffd4fd18b6a9ae3bd8e
Author: Rob Clark <robcl...@freedesktop.org>
Date: Sat Aug 23 09:33:50 2014 -0400
freedreno: implement pipe_flush_resource()
Signed-off-by: Rob Clark <robcl...@freedesktop.org>
(cherry picked from commit b40a6c2b17de1f63d70d62608737ed9a259da1c5)
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c
b/src/gallium/drivers/freedreno/freedreno_resource.c
index 65dfc04..034e4b4 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -438,8 +438,12 @@ fd_blitter_pipe_end(struct fd_context *ctx)
}
static void
-fd_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource)
+fd_flush_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
{
+ struct fd_resource *rsc = fd_resource(prsc);
+
+ if (rsc->dirty)
+ fd_context_render(pctx);
}
void
commit cd94c644217a8b1ed13bc6eaba44ebdde6074f78
Author: Rob Clark <robcl...@freedesktop.org>
Date: Fri Aug 22 18:33:15 2014 -0400
freedreno: don't ignore src/dst level
Don't ignore src/dst_level in pipe_copy_region.
Signed-off-by: Rob Clark <robcl...@freedesktop.org>
(cherry picked from commit 478a08ebd2b29724f2d440e560ab331c534236cd)
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c
b/src/gallium/drivers/freedreno/freedreno_resource.c
index ebc134a..65dfc04 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -304,7 +304,36 @@ fail:
return NULL;
}
-static bool render_blit(struct pipe_context *pctx, struct pipe_blit_info
*info);
+static void fd_blitter_pipe_begin(struct fd_context *ctx);
+static void fd_blitter_pipe_end(struct fd_context *ctx);
+
+/**
+ * _copy_region using pipe (3d engine)
+ */
+static bool
+fd_blitter_pipe_copy_region(struct fd_context *ctx,
+ struct pipe_resource *dst,
+ unsigned dst_level,
+ unsigned dstx, unsigned dsty, unsigned dstz,
+ struct pipe_resource *src,
+ unsigned src_level,
+ const struct pipe_box *src_box)
+{
+ /* not until we allow rendertargets to be buffers */
+ if (dst->target == PIPE_BUFFER || src->target == PIPE_BUFFER)
+ return false;
+
+ if (!util_blitter_is_copy_supported(ctx->blitter, dst, src))
+ return false;
+
+ fd_blitter_pipe_begin(ctx);
+ util_blitter_copy_texture(ctx->blitter,
+ dst, dst_level, dstx, dsty, dstz,
+ src, src_level, src_box);
+ fd_blitter_pipe_end(ctx);
+
+ return true;
+}
/**
* Copy a block of pixels from one resource to another.
@@ -320,40 +349,33 @@ fd_resource_copy_region(struct pipe_context *pctx,
unsigned src_level,
const struct pipe_box *src_box)
{
+ struct fd_context *ctx = fd_context(pctx);
+
/* TODO if we have 2d core, or other DMA engine that could be used
* for simple copies and reasonably easily synchronized with the 3d
* core, this is where we'd plug it in..
*/
- struct pipe_blit_info info = {
- .dst = {
- .resource = dst,
- .box = {
- .x = dstx,
- .y = dsty,
- .z = dstz,
- .width = src_box->width,
- .height = src_box->height,
- .depth = src_box->depth,
- },
- .format = util_format_linear(dst->format),
- },
- .src = {
- .resource = src,
- .box = *src_box,
- .format = util_format_linear(src->format),
- },
- .mask = PIPE_MASK_RGBA,
- .filter = PIPE_TEX_FILTER_NEAREST,
- };
- render_blit(pctx, &info);
+
+ /* try blit on 3d pipe: */
+ if (fd_blitter_pipe_copy_region(ctx,
+ dst, dst_level, dstx, dsty, dstz,
+ src, src_level, src_box))
+ return;
+
+ /* else fallback to pure sw: */
+ util_resource_copy_region(pctx,
+ dst, dst_level, dstx, dsty, dstz,
+ src, src_level, src_box);
}
-/* Optimal hardware path for blitting pixels.
+/**
+ * Optimal hardware path for blitting pixels.
* Scaling, format conversion, up- and downsampling (resolve) are allowed.
*/
static void
fd_blit(struct pipe_context *pctx, const struct pipe_blit_info *blit_info)
{
+ struct fd_context *ctx = fd_context(pctx);
struct pipe_blit_info info = *blit_info;
if (info.src.resource->nr_samples > 1 &&
@@ -373,21 +395,21 @@ fd_blit(struct pipe_context *pctx, const struct
pipe_blit_info *blit_info)
info.mask &= ~PIPE_MASK_S;
}
- render_blit(pctx, &info);
-}
-
-static bool
-render_blit(struct pipe_context *pctx, struct pipe_blit_info *info)
-{
- struct fd_context *ctx = fd_context(pctx);
-
- if (!util_blitter_is_blit_supported(ctx->blitter, info)) {
+ if (!util_blitter_is_blit_supported(ctx->blitter, &info)) {
DBG("blit unsupported %s -> %s",
-
util_format_short_name(info->src.resource->format),
-
util_format_short_name(info->dst.resource->format));
- return false;
+
util_format_short_name(info.src.resource->format),
+
util_format_short_name(info.dst.resource->format));
+ return;
}
+ fd_blitter_pipe_begin(ctx);
+ util_blitter_blit(ctx->blitter, &info);
+ fd_blitter_pipe_end(ctx);
+}
+
+static void
+fd_blitter_pipe_begin(struct fd_context *ctx)
+{
util_blitter_save_vertex_buffer_slot(ctx->blitter, ctx->vertexbuf.vb);
util_blitter_save_vertex_elements(ctx->blitter, ctx->vtx);
util_blitter_save_vertex_shader(ctx->blitter, ctx->prog.vp);
@@ -407,10 +429,12 @@ render_blit(struct pipe_context *pctx, struct
pipe_blit_info *info)
ctx->fragtex.num_textures, ctx->fragtex.textures);
fd_hw_query_set_stage(ctx, ctx->ring, FD_STAGE_BLIT);
- util_blitter_blit(ctx->blitter, info);
- fd_hw_query_set_stage(ctx, ctx->ring, FD_STAGE_NULL);
+}
- return true;
+static void
+fd_blitter_pipe_end(struct fd_context *ctx)
+{
+ fd_hw_query_set_stage(ctx, ctx->ring, FD_STAGE_NULL);
}
static void
commit e9923b2194b2a000d2a720e79746d66277d9019b
Author: Jonathan Gray <j...@jsg.id.au>
Date: Tue Sep 2 02:08:00 2014 +1000
automake: check if the linker supports --dynamic-list
--
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/e1xtttx-000292...@moszumanska.debian.org
