[arch-commits] Commit in mesa/trunk (2 files)

2020-05-22 Thread Laurent Carlier via arch-commits
Date: Friday, May 22, 2020 @ 14:01:47
  Author: lcarlier
Revision: 387423

upgpkg: mesa 20.0.7-3: reenable LTO with upstream patch (FS#6)

Added:
  mesa/trunk/0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
Modified:
  mesa/trunk/PKGBUILD

-+
 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch |   53 
++
 PKGBUILD|8 +
 2 files changed, 59 insertions(+), 2 deletions(-)

Added: 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
===
--- 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch 
(rev 0)
+++ 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch 
2020-05-22 14:01:47 UTC (rev 387423)
@@ -0,0 +1,53 @@
+From 979ae78318c3e37cc0e0579b8d1f05c46bb76e7d Mon Sep 17 00:00:00 2001
+From: Danylo Piliaiev 
+Date: Tue, 19 May 2020 20:35:49 +0300
+Subject: [PATCH] meson: Disable GCC's dead store elimination for memory
+ zeroing custom new
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some classes use custom new operator which zeroes memory, however gcc does
+aggressive dead-store elimination which threats all writes to the memory
+before the constructor as "dead stores".
+
+For now we disable this optimization.
+
+The new operators in question are declared via:
+ DECLARE_RZALLOC_CXX_OPERATORS
+ DECLARE_LINEAR_ZALLOC_CXX_OPERATORS
+
+The issue was found with lto builds, however there is no guarantee that
+it didn't happen with ordinary ones.
+
+CC: 
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2977
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1358
+Signed-off-by: Danylo Piliaiev 
+Reviewed-by: Marek Olšák 
+Part-of: 
+(cherry picked from commit 5500a2b7fc558217bbd4c2a966ab6fcadaed8b3b)
+Signed-off-by: Laurent Carlier 
+---
+ meson.build   | 5 +
+ 1 files changed, 5 insertions(+), 0 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ba4fdb2a59f..434684c8bcc 100644
+--- a/meson.build
 b/meson.build
+@@ -980,6 +980,11 @@ else
+ '-fno-math-errno',
+ '-fno-trapping-math',
+ '-Qunused-arguments',
++# Some classes use custom new operator which zeroes memory, however
++# gcc does aggressive dead-store elimination which threats all writes
++# to the memory before the constructor as "dead stores".
++# For now we disable this optimization.
++'-flifetime-dse=1',
+   ]
+   # MinGW chokes on format specifiers and I can't get it all working
+   if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows')
+-- 
+2.26.2
+

Modified: PKGBUILD
===
--- PKGBUILD2020-05-22 12:42:21 UTC (rev 387422)
+++ PKGBUILD2020-05-22 14:01:47 UTC (rev 387423)
@@ -5,7 +5,7 @@
 pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 
'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
 pkgver=20.0.7
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 
'libxshmfence' 'libxxf86vm'
  'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 
'zstd'
@@ -16,11 +16,13 @@
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
0001-swr-Fix-build-with-GCC-10.patch
0001-omx-fix-build-with-gcc-10.patch
+   0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
 LICENSE)
 
sha512sums=('00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685'
 'SKIP'
 
'296a7502e959ccd2a6f1279878c0562a853ecdd78b5960196fc8f99ed8dd995c6e1106551aef7a53db891295235ca55676788e7cf78e336e2d5ee49e4e463be5'
 
'e1f0fa2a8802184580d9d95777f02a1c35bf71c3ab380d88e5b9268f84c2ac338fa517d20065094b7764490bbbfb290c1c5ad6dec6d27f3dbf737dfa0b6c7263'
+
'566ad6f4195124b4af05d4bba1e01cc5e9ac466f11ddd900a2f5bfd830aa19cdccb3f9625901340b5fe62e7d8ea50aa336ab5031a658fe90916d847b2e9946e0'
 
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov 

   '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez 

@@ -35,11 +37,13 @@
   # fix building with gcc 10
   patch -Np1 -i ../0001-swr-Fix-build-with-GCC-10.patch
   patch -Np1 -i ../0001-omx-fix-build-with-gcc-10.patch
+  # LTO fix
+  patch -Np1 -i 
../0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
 }
 
 build() {
   arch-meson mesa-$pkgver build \
--D b_lto=false \
+-D b_lto=true \
  

[arch-commits] Commit in mesa/trunk (2 files)

2020-04-23 Thread Felix Yan via arch-commits
Date: Thursday, April 23, 2020 @ 22:50:38
  Author: felixonmars
Revision: 381451

upgpkg: mesa 20.0.5-1

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch

-+
 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch |   54 
--
 PKGBUILD|   13 --
 2 files changed, 3 insertions(+), 64 deletions(-)

Deleted: 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch
===
--- 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch 
2020-04-23 22:42:54 UTC (rev 381450)
+++ 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch 
2020-04-23 22:50:38 UTC (rev 381451)
@@ -1,54 +0,0 @@
-From 4d3f535ebb341ddce05e5b1750fcf17c6c4166c9 Mon Sep 17 00:00:00 2001
-From: James Xiong 
-Date: Wed, 20 Nov 2019 15:59:00 -0800
-Subject: [PATCH] iris: handle the failure of converting unsupported yuv
- formats to isl
-
-Signed-off-by: James Xiong 
-Reviewed-by: Kenneth Graunke 
-(cherry picked from commit d8569baaed1a38cf3da9e45375fa2267d9a1eeb0)
-
-Tested-by: Marge Bot 

-Part-of: 
-Signed-off-by: Laurent Carlier 

- src/gallium/drivers/iris/iris_formats.c  | 6 +-
- src/gallium/drivers/iris/iris_resource.c | 3 ++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/drivers/iris/iris_formats.c 
b/src/gallium/drivers/iris/iris_formats.c
-index f6344cc7543..a35b663a53c 100644
 a/src/gallium/drivers/iris/iris_formats.c
-+++ b/src/gallium/drivers/iris/iris_formats.c
-@@ -338,9 +338,13 @@ iris_format_for_usage(const struct gen_device_info 
*devinfo,
-   isl_surf_usage_flags_t usage)
- {
-enum isl_format format = iris_isl_format_for_pipe_format(pformat);
--   const struct isl_format_layout *fmtl = isl_format_get_layout(format);
-struct isl_swizzle swizzle = ISL_SWIZZLE_IDENTITY;
- 
-+   if (format == ISL_FORMAT_UNSUPPORTED)
-+  return (struct iris_format_info) { .fmt = format, .swizzle = swizzle };
-+
-+   const struct isl_format_layout *fmtl = isl_format_get_layout(format);
-+
-if (!util_format_is_srgb(pformat)) {
-   if (util_format_is_intensity(pformat)) {
-  swizzle = ISL_SWIZZLE(RED, RED, RED, RED);
-diff --git a/src/gallium/drivers/iris/iris_resource.c 
b/src/gallium/drivers/iris/iris_resource.c
-index bdd715df2c9..7ca6097840a 100644
 a/src/gallium/drivers/iris/iris_resource.c
-+++ b/src/gallium/drivers/iris/iris_resource.c
-@@ -85,7 +85,8 @@ modifier_is_supported(const struct gen_device_info *devinfo,
- 
-   enum isl_format linear_format = isl_format_srgb_to_linear(rt_format);
- 
--  if (!isl_format_supports_ccs_e(devinfo, linear_format))
-+  if (linear_format == ISL_FORMAT_UNSUPPORTED ||
-+  !isl_format_supports_ccs_e(devinfo, linear_format))
-  return false;
- 
-   return devinfo->gen >= 9 && devinfo->gen <= 11;
--- 
-2.25.1
-

Modified: PKGBUILD
===
--- PKGBUILD2020-04-23 22:42:54 UTC (rev 381450)
+++ PKGBUILD2020-04-23 22:50:38 UTC (rev 381451)
@@ -4,8 +4,8 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 
'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=20.0.4
-pkgrel=2
+pkgver=20.0.5
+pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 
'libxshmfence' 'libxxf86vm'
  'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 
'zstd'
@@ -14,11 +14,9 @@
 url="https://www.mesa3d.org/;
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-
mesa-llvm-10.patch::https://github.com/mesa3d/mesa/commit/ff1a3a00cb37d84ab9a563f0aa241714876f56b4.patch
 LICENSE)
-sha512sums=('17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55'
+sha512sums=('6f5780f7574400fea54978b40eb97faca35826a8a7bed96362d7bebcda78e2cadd44585ef8dd7dc126e0cc62cff61bee9b2ea360fedcc09a1fbb4c1f20c6aa08'
 'SKIP'
-
'e6c1812816ed6251959400a9f6824b604b69d4ce057b677baff8c4c2c41de8edc1571ce13f0cc9ec87eb0e9d007a305b6a1727d820a8632f482c7a8629bd6fb8'
 
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov 

   '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez 

@@ -27,11 +25,6 @@
   '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker 

  

[arch-commits] Commit in mesa/trunk (2 files)

2020-02-22 Thread Laurent Carlier via arch-commits
Date: Saturday, February 22, 2020 @ 16:36:18
  Author: lcarlier
Revision: 376045

upgpkg: mesa 20.0.0-2: Fix FS#65580

Added:
  mesa/trunk/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch
Modified:
  mesa/trunk/PKGBUILD

-+
 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch |   54 
++
 PKGBUILD|   15 ++
 2 files changed, 66 insertions(+), 3 deletions(-)

Added: 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch
===
--- 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch 
(rev 0)
+++ 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch 
2020-02-22 16:36:18 UTC (rev 376045)
@@ -0,0 +1,54 @@
+From 4d3f535ebb341ddce05e5b1750fcf17c6c4166c9 Mon Sep 17 00:00:00 2001
+From: James Xiong 
+Date: Wed, 20 Nov 2019 15:59:00 -0800
+Subject: [PATCH] iris: handle the failure of converting unsupported yuv
+ formats to isl
+
+Signed-off-by: James Xiong 
+Reviewed-by: Kenneth Graunke 
+(cherry picked from commit d8569baaed1a38cf3da9e45375fa2267d9a1eeb0)
+
+Tested-by: Marge Bot 

+Part-of: 
+Signed-off-by: Laurent Carlier 
+---
+ src/gallium/drivers/iris/iris_formats.c  | 6 +-
+ src/gallium/drivers/iris/iris_resource.c | 3 ++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/drivers/iris/iris_formats.c 
b/src/gallium/drivers/iris/iris_formats.c
+index f6344cc7543..a35b663a53c 100644
+--- a/src/gallium/drivers/iris/iris_formats.c
 b/src/gallium/drivers/iris/iris_formats.c
+@@ -338,9 +338,13 @@ iris_format_for_usage(const struct gen_device_info 
*devinfo,
+   isl_surf_usage_flags_t usage)
+ {
+enum isl_format format = iris_isl_format_for_pipe_format(pformat);
+-   const struct isl_format_layout *fmtl = isl_format_get_layout(format);
+struct isl_swizzle swizzle = ISL_SWIZZLE_IDENTITY;
+ 
++   if (format == ISL_FORMAT_UNSUPPORTED)
++  return (struct iris_format_info) { .fmt = format, .swizzle = swizzle };
++
++   const struct isl_format_layout *fmtl = isl_format_get_layout(format);
++
+if (!util_format_is_srgb(pformat)) {
+   if (util_format_is_intensity(pformat)) {
+  swizzle = ISL_SWIZZLE(RED, RED, RED, RED);
+diff --git a/src/gallium/drivers/iris/iris_resource.c 
b/src/gallium/drivers/iris/iris_resource.c
+index bdd715df2c9..7ca6097840a 100644
+--- a/src/gallium/drivers/iris/iris_resource.c
 b/src/gallium/drivers/iris/iris_resource.c
+@@ -85,7 +85,8 @@ modifier_is_supported(const struct gen_device_info *devinfo,
+ 
+   enum isl_format linear_format = isl_format_srgb_to_linear(rt_format);
+ 
+-  if (!isl_format_supports_ccs_e(devinfo, linear_format))
++  if (linear_format == ISL_FORMAT_UNSUPPORTED ||
++  !isl_format_supports_ccs_e(devinfo, linear_format))
+  return false;
+ 
+   return devinfo->gen >= 9 && devinfo->gen <= 11;
+-- 
+2.25.1
+

Modified: PKGBUILD
===
--- PKGBUILD2020-02-22 16:06:12 UTC (rev 376044)
+++ PKGBUILD2020-02-22 16:36:18 UTC (rev 376045)
@@ -5,7 +5,7 @@
 pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 
'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
 pkgver=20.0.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 
'libxshmfence' 'libxxf86vm'
  'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 
'zstd'
@@ -14,10 +14,12 @@
 url="https://www.mesa3d.org/;
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-LICENSE)
+LICENSE
+   0001-iris-handle-the-failure-of-converting-unsupported-yu.patch)
 
sha512sums=('3968820029434682fb6644947c76e12b6bb991a3d05cb519a6ea971ecc4aa9b21d03f84b9a452cc21cc77a7981db9e40dd2dfd3ea3dee85b3dd88a59b4842bbb'
 'SKIP'
-
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
+
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
+
'dc14204b32dfc9c04506b9ee1b0ed070c516fb60771b4330ab9f83efb02be0e206a34a1b01acda624c7c3984275b9d7ba6ea5c1f9ec4447a7cc561cc5abdf759')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov 

   '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez 

   'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio 
Suárez Romero (Igalia, S.L.) 
@@ -24,6 +26,13 @@
   

[arch-commits] Commit in mesa/trunk (2 files)

2020-02-20 Thread Laurent Carlier via arch-commits
Date: Thursday, February 20, 2020 @ 13:27:00
  Author: lcarlier
Revision: 375917

upgpkg: mesa 20.0.0-1: upstream update 20.0.0

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  
mesa/trunk/0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch

+
 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch |   66 
--
 PKGBUILD   |   27 
+---
 2 files changed, 10 insertions(+), 83 deletions(-)

Deleted: 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
===
--- 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch  
2020-02-20 12:38:00 UTC (rev 375916)
+++ 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch  
2020-02-20 13:27:00 UTC (rev 375917)
@@ -1,66 +0,0 @@
-From 689817c9dfde9a0852f2b2489cb0fa93ffbcb215 Mon Sep 17 00:00:00 2001
-From: Krzysztof Raszkowski 
-Date: Mon, 10 Feb 2020 16:24:10 +0100
-Subject: [PATCH] gallium/swr: simplify environmental variabled expansion code
-
-There were 2 versions of code doing the same thing.
-Since std::regexp are locale-sensitive better is to leave old
-good way to do this.
-
-Reviewed-by: Jan Zielinski 
-Tested-by: Marge Bot 

-Part-of: 

- .../codegen/templates/gen_knobs.cpp   | 29 ---
- 1 file changed, 29 deletions(-)
-
-diff --git 
a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp 
b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
-index b073f73e3a0..194499aa1e0 100644
 a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
-+++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
-@@ -43,9 +43,6 @@
- //
- void KnobBase::autoExpandEnvironmentVariables(std::string& text)
- {
--#if (__GNUC__) && (GCC_VERSION < 40900)
--//  isn't implemented prior to gcc-4.9.0
--// unix style variable replacement
- size_t start;
- while ((start = text.find("${'${'}")) != std::string::npos)
- {
-@@ -64,32 +61,6 @@ void KnobBase::autoExpandEnvironmentVariables(std::string& 
text)
- const std::string var = GetEnv(text.substr(start + 1, end - start - 
1));
- text.replace(start, end - start + 1, var);
- }
--#else
--{
--// unix style variable replacement
--static std::regex env("\\$\\{([^}]+?)\\}");
--std::smatch   match;
--while (std::regex_search(text, match, env))
--{
--const std::string var = GetEnv(match[1].str());
--// certain combinations of gcc/libstd++ have problems with this
--// text.replace(match[0].first, match[0].second, var);
--text.replace(match.prefix().length(), match[0].length(), var);
--}
--}
--{
--// win32 style variable replacement
--static std::regex env("%([^%]+?)%");
--std::smatch   match;
--while (std::regex_search(text, match, env))
--{
--const std::string var = GetEnv(match[1].str());
--// certain combinations of gcc/libstd++ have problems with this
--// text.replace(match[0].first, match[0].second, var);
--text.replace(match.prefix().length(), match[0].length(), var);
--}
--}
--#endif
- }
- 
- //
--- 
-2.24.1
-

Modified: PKGBUILD
===
--- PKGBUILD2020-02-20 12:38:00 UTC (rev 375916)
+++ PKGBUILD2020-02-20 13:27:00 UTC (rev 375917)
@@ -4,21 +4,19 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 
'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=19.3.4
-pkgrel=2
+pkgver=20.0.0
+pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 
'libxshmfence' 'libxxf86vm'
- 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
+ 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 
'zstd'
  'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 
'libunwind' 'lm_sensors'
  'libxrandr' 'valgrind' 'glslang' 'meson')
 url="https://www.mesa3d.org/;
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
 LICENSE)
-sha512sums=('2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb'

[arch-commits] Commit in mesa/trunk (2 files)

2020-02-14 Thread Christian Hesse via arch-commits
Date: Friday, February 14, 2020 @ 22:28:20
  Author: eworm
Revision: 375614

upgpkg: mesa 19.3.4-2

fix illegal instruction (FS#65498)

Added:
  
mesa/trunk/0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
Modified:
  mesa/trunk/PKGBUILD

+
 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch |   66 
++
 PKGBUILD   |   22 
++-
 2 files changed, 81 insertions(+), 7 deletions(-)

Added: 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
===
--- 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch  
(rev 0)
+++ 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch  
2020-02-14 22:28:20 UTC (rev 375614)
@@ -0,0 +1,66 @@
+From 689817c9dfde9a0852f2b2489cb0fa93ffbcb215 Mon Sep 17 00:00:00 2001
+From: Krzysztof Raszkowski 
+Date: Mon, 10 Feb 2020 16:24:10 +0100
+Subject: [PATCH] gallium/swr: simplify environmental variabled expansion code
+
+There were 2 versions of code doing the same thing.
+Since std::regexp are locale-sensitive better is to leave old
+good way to do this.
+
+Reviewed-by: Jan Zielinski 
+Tested-by: Marge Bot 

+Part-of: 
+---
+ .../codegen/templates/gen_knobs.cpp   | 29 ---
+ 1 file changed, 29 deletions(-)
+
+diff --git 
a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp 
b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
+index b073f73e3a0..194499aa1e0 100644
+--- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
 b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
+@@ -43,9 +43,6 @@
+ //
+ void KnobBase::autoExpandEnvironmentVariables(std::string& text)
+ {
+-#if (__GNUC__) && (GCC_VERSION < 40900)
+-//  isn't implemented prior to gcc-4.9.0
+-// unix style variable replacement
+ size_t start;
+ while ((start = text.find("${'${'}")) != std::string::npos)
+ {
+@@ -64,32 +61,6 @@ void KnobBase::autoExpandEnvironmentVariables(std::string& 
text)
+ const std::string var = GetEnv(text.substr(start + 1, end - start - 
1));
+ text.replace(start, end - start + 1, var);
+ }
+-#else
+-{
+-// unix style variable replacement
+-static std::regex env("\\$\\{([^}]+?)\\}");
+-std::smatch   match;
+-while (std::regex_search(text, match, env))
+-{
+-const std::string var = GetEnv(match[1].str());
+-// certain combinations of gcc/libstd++ have problems with this
+-// text.replace(match[0].first, match[0].second, var);
+-text.replace(match.prefix().length(), match[0].length(), var);
+-}
+-}
+-{
+-// win32 style variable replacement
+-static std::regex env("%([^%]+?)%");
+-std::smatch   match;
+-while (std::regex_search(text, match, env))
+-{
+-const std::string var = GetEnv(match[1].str());
+-// certain combinations of gcc/libstd++ have problems with this
+-// text.replace(match[0].first, match[0].second, var);
+-text.replace(match.prefix().length(), match[0].length(), var);
+-}
+-}
+-#endif
+ }
+ 
+ //
+-- 
+2.24.1
+

Modified: PKGBUILD
===
--- PKGBUILD2020-02-14 20:17:28 UTC (rev 375613)
+++ PKGBUILD2020-02-14 22:28:20 UTC (rev 375614)
@@ -5,7 +5,7 @@
 pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 
'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
 pkgver=19.3.4
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 
'libxshmfence' 'libxxf86vm'
  'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
@@ -14,9 +14,11 @@
 url="https://www.mesa3d.org/;
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
 LICENSE)
 
sha512sums=('2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb'
 'SKIP'
+
'10c62cef7b9cd2617453397a7585fcc36bbe3dbb817f44fd59aee2ba11df67e5943cd919838f51e37ee523757210c3a3685c4676f561801cc9e47378b1c5fa09'
 

[arch-commits] Commit in mesa/trunk (2 files)

2018-05-13 Thread Laurent Carlier via arch-commits
Date: Sunday, May 13, 2018 @ 15:39:59
  Author: lcarlier
Revision: 324160

upgpkg: mesa 18.0.3-2

fix FS#58549

Added:
  
mesa/trunk/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
Modified:
  mesa/trunk/PKGBUILD

+
 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch 
|   14 ++
 PKGBUILD   
|9 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

Added: 
0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
===
--- 
0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch  
(rev 0)
+++ 
0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch  
2018-05-13 15:39:59 UTC (rev 324160)
@@ -0,0 +1,14 @@
+diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
+index 6bb11c4..7bd79af 100644
+--- a/src/loader/loader_dri3_helper.c
 b/src/loader/loader_dri3_helper.c
+@@ -234,6 +234,9 @@ loader_dri3_drawable_fini(struct loader_dri3_drawable 
*draw)
+ {
+int i;
+ 
++   if (draw->special_event)
++  loader_dri3_swapbuffer_barrier(draw);
++
+draw->ext->core->destroyDrawable(draw->dri_drawable);
+ 
+for (i = 0; i < ARRAY_SIZE(draw->buffers); i++) {

Modified: PKGBUILD
===
--- PKGBUILD2018-05-13 15:37:31 UTC (rev 324159)
+++ PKGBUILD2018-05-13 15:39:59 UTC (rev 324160)
@@ -6,7 +6,7 @@
 pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 
'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
 pkgver=18.0.3
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 
'wayland' 'wayland-protocols'
@@ -17,6 +17,7 @@
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
 LICENSE
 0001-glvnd-fix-gl-dot-pc.patch
+
0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
 0004-meson-Add-library-versions-to-swr-drivers.patch
 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch)
 
sha512sums=('decd050bab049d17bcde3f832d4da0ffdb80f147c99377a162739bbe72fd6fd32b51e56e6fc66895b8c30fc19a1815bae164b21aa557816c3998ad18c1ffca2d'
@@ -23,6 +24,7 @@
 'SKIP'
 
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
 
'75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c43cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
+
'19b980db37675732d28978318074ca172ef862de7fdcae2c82ef16dc411c709c8598b044a828e7e260d86d23f644485abcc6a0aaf5e04b9c05dce22d0c7e3716'
 
'0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff'
 
'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov 

@@ -36,6 +38,11 @@
   # non-upstreamed ones
   patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch
 
+  # experimental patch, should fix FS#58549
+  # see https://bugs.freedesktop.org/show_bug.cgi?id=106351
+  # and https://patchwork.freedesktop.org/series/42687/
+  patch -Np1 -i 
../0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
+
   # Upstreamed meson fixes
   patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch
   patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch


[arch-commits] Commit in mesa/trunk (2 files)

2018-04-17 Thread Jan Steffens via arch-commits
Date: Tuesday, April 17, 2018 @ 18:49:02
  Author: heftig
Revision: 321931

Use b_ndebug, as documented in docs/meson.html

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0003-meson-Define-NDEBUG-for-non-debug-builds.patch

-+
 0003-meson-Define-NDEBUG-for-non-debug-builds.patch |   34 --
 PKGBUILD|4 --
 2 files changed, 1 insertion(+), 37 deletions(-)

Deleted: 0003-meson-Define-NDEBUG-for-non-debug-builds.patch
===
--- 0003-meson-Define-NDEBUG-for-non-debug-builds.patch 2018-04-17 17:38:38 UTC 
(rev 321930)
+++ 0003-meson-Define-NDEBUG-for-non-debug-builds.patch 2018-04-17 18:49:02 UTC 
(rev 321931)
@@ -1,34 +0,0 @@
-From 8ea7fb2d833e673a13488a9a5301c906b781fc04 Mon Sep 17 00:00:00 2001
-Message-Id: 
<8ea7fb2d833e673a13488a9a5301c906b781fc04.1523725229.git.jan.steff...@gmail.com>
-In-Reply-To: 

-References: 

-From: "Jan Alexander Steffens (heftig)" 
-Date: Sat, 14 Apr 2018 18:32:44 +0200
-Subject: [PATCH 3/5] meson: Define NDEBUG for non-debug-builds
-
-This is for parity with autotools. We were suddenly getting assertion
-failures after switching to meson, see [1].
-
-[1]: https://bugs.archlinux.org/task/58218
-
-Signed-off-by: Jan Alexander Steffens (heftig) 

- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index bc1905178d..41a5a0c2ba 100644
 a/meson.build
-+++ b/meson.build
-@@ -646,6 +646,8 @@ endif
- # Define DEBUG for debug builds only (debugoptimized is not included on this 
one)
- if get_option('buildtype') == 'debug'
-   pre_args += '-DDEBUG'
-+else
-+  pre_args += '-DNDEBUG'
- endif
- 
- if get_option('shader-cache')
--- 
-2.16.2
-

Modified: PKGBUILD
===
--- PKGBUILD2018-04-17 17:38:38 UTC (rev 321930)
+++ PKGBUILD2018-04-17 18:49:02 UTC (rev 321931)
@@ -20,7 +20,6 @@
 0001-glvnd-fix-gl-dot-pc.patch
 0001-meson-fix-megadriver-symlinking.patch
 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
-0003-meson-Define-NDEBUG-for-non-debug-builds.patch
 0004-meson-Add-library-versions-to-swr-drivers.patch
 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch)
 
sha512sums=('1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396'
@@ -30,7 +29,6 @@
 
'75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c43cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
 
'9dc2098f98694fb0f3d0b1d3d8c2bed43a8e6379ee73f6638b691a6823baaa28712ffddbae90d06b9295ae0536aa1091a0415ee72207ec3621acfb72f7d22f32'
 
'81d374421ba036a45699bc2a84006f5359fe914d25af6c0f23d2a86d1a6a9f61e909faaad11f0191517b4eed7d8dba42fd8c596cffe70b917544d502bf57396b'
-
'4884ff93eb17c4601f1d03f43848c803cbfb87d131e8e21261e22a0f197e6241a1d4b12b97af6a79ca57b010c8425b1c9544acfa1c19f90a447d5d4b3c6dd69e'
 
'0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff'
 
'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov 

@@ -47,7 +45,6 @@
   # Upstreamed meson fixes
   patch -Np1 -i ../0001-meson-fix-megadriver-symlinking.patch
   patch -Np1 -i ../0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
-  patch -Np1 -i ../0003-meson-Define-NDEBUG-for-non-debug-builds.patch
   patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch
   patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
 
@@ -58,6 +55,7 @@
 build() {
   arch-meson mesa-$pkgver build \
 -D b_lto=false \
+-D b_ndebug=true \
 -D platforms=x11,wayland,drm,surfaceless \
 -D dri-drivers=i915,i965,r100,r200,nouveau \
 -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr \


[arch-commits] Commit in mesa/trunk (2 files)

2018-01-19 Thread Laurent Carlier via arch-commits
Date: Friday, January 19, 2018 @ 12:08:06
  Author: lcarlier
Revision: 315142

upgpkg: mesa 17.3.3-1

upstream update 17.3.3

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch

---+
 0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch |   74 
 PKGBUILD  |   11 -
 2 files changed, 3 insertions(+), 82 deletions(-)

Deleted: 0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch
===
--- 0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch   2018-01-19 
11:11:27 UTC (rev 315141)
+++ 0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch   2018-01-19 
12:08:06 UTC (rev 315142)
@@ -1,74 +0,0 @@
-From 897c54d522ab960a879b763a15e489f630c491ee Mon Sep 17 00:00:00 2001
-From: Thomas Hellstrom 
-Date: Thu, 11 Jan 2018 10:19:23 +0100
-Subject: [PATCH] loader/dri3: Avoid freeing renderbuffers in use
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upon reception of an event that lowered the number of active back buffers,
-the code would immediately try to free all back buffers with an id equal to or
-higher than the new number of active back buffers.
-
-However, that could lead to an active or to-be-active back buffer being freed,
-since the old number of back buffers was used when obtaining an idle back
-buffer for use.
-
-This lead to crashes when lowering the number of active back buffers by
-transitioning from page-flipping to non-page-flipping presents.
-
-Fix this by computing the number of active back buffers only when trying to
-obtain a new back buffer.
-
-Fixes: 15e208c4cc ("loader/dri3: Don't accidently free buffer holding new back 
content")
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104214
-Cc: "17.3" 
-Tested-by: Andriy.Khulap 
-Tested-by: Vadym Shovkoplias 
-Reviewed-by: Michel Dänzer 
-Signed-off-by: Thomas Hellstrom 

- src/loader/loader_dri3_helper.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
-index cc890bc923..8f8efcb646 100644
 a/src/loader/loader_dri3_helper.c
-+++ b/src/loader/loader_dri3_helper.c
-@@ -205,7 +205,6 @@ void
- loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval)
- {
-draw->swap_interval = interval;
--   dri3_update_num_back(draw);
- }
- 
- /** dri3_free_render_buffer
-@@ -377,7 +376,6 @@ dri3_handle_present_event(struct loader_dri3_drawable 
*draw,
- draw->flipping = false;
- break;
-  }
-- dri3_update_num_back(draw);
- 
-  if (draw->vtable->show_fps)
- draw->vtable->show_fps(draw, ce->ust);
-@@ -402,7 +400,8 @@ dri3_handle_present_event(struct loader_dri3_drawable 
*draw,
- buf->busy = 0;
- 
-  if (buf && draw->num_back <= b && b < LOADER_DRI3_MAX_BACK &&
-- draw->cur_blit_source != b) {
-+ draw->cur_blit_source != b &&
-+ !buf->busy) {
- dri3_free_render_buffer(draw, buf);
- draw->buffers[b] = NULL;
-  }
-@@ -537,6 +536,7 @@ dri3_find_back(struct loader_dri3_drawable *draw)
-/* Check whether we need to reuse the current back buffer as new back.
- * In that case, wait until it's not busy anymore.
- */
-+   dri3_update_num_back(draw);
-num_to_consider = draw->num_back;
-if (!loader_dri3_have_image_blit(draw) && draw->cur_blit_source != -1) {
-   num_to_consider = 1;
--- 
-2.15.1
-

Modified: PKGBUILD
===
--- PKGBUILD2018-01-19 11:11:27 UTC (rev 315141)
+++ PKGBUILD2018-01-19 12:08:06 UTC (rev 315142)
@@ -4,8 +4,8 @@
 
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 
'mesa-vdpau' 'mesa')
-pkgver=17.3.2
-pkgrel=2
+pkgver=17.3.3
+pkgrel=1
 arch=('x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 
'wayland' 'wayland-protocols'
@@ -14,12 +14,10 @@
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
 LICENSE
-0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch
 0002-glvnd-fix-gl-dot-pc.patch)
-sha256sums=('e2844a13f2d6f8f24bee65804a51c42d8dc6ae9c36cff7ee61d0940e796d64c6'
+sha256sums=('41bac5de0ef6adc1f41a1ec0f80c19e361298ce02fa81b5f9ba4fdca33a9379b'
 'SKIP'
 '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
-

[arch-commits] Commit in mesa/trunk (2 files)

2018-01-12 Thread Evangelos Foutras via arch-commits
Date: Friday, January 12, 2018 @ 18:57:35
  Author: foutrelis
Revision: 314642

upgpkg: mesa 17.3.2-2

Fix opengl crashes caused by incorrect buffer freeing (FS#56944).

Added:
  mesa/trunk/0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch
Modified:
  mesa/trunk/PKGBUILD

---+
 0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch |   74 
 PKGBUILD  |7 -
 2 files changed, 80 insertions(+), 1 deletion(-)

Added: 0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch
===
--- 0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch   
(rev 0)
+++ 0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch   2018-01-12 
18:57:35 UTC (rev 314642)
@@ -0,0 +1,74 @@
+From 897c54d522ab960a879b763a15e489f630c491ee Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom 
+Date: Thu, 11 Jan 2018 10:19:23 +0100
+Subject: [PATCH] loader/dri3: Avoid freeing renderbuffers in use
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upon reception of an event that lowered the number of active back buffers,
+the code would immediately try to free all back buffers with an id equal to or
+higher than the new number of active back buffers.
+
+However, that could lead to an active or to-be-active back buffer being freed,
+since the old number of back buffers was used when obtaining an idle back
+buffer for use.
+
+This lead to crashes when lowering the number of active back buffers by
+transitioning from page-flipping to non-page-flipping presents.
+
+Fix this by computing the number of active back buffers only when trying to
+obtain a new back buffer.
+
+Fixes: 15e208c4cc ("loader/dri3: Don't accidently free buffer holding new back 
content")
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104214
+Cc: "17.3" 
+Tested-by: Andriy.Khulap 
+Tested-by: Vadym Shovkoplias 
+Reviewed-by: Michel Dänzer 
+Signed-off-by: Thomas Hellstrom 
+---
+ src/loader/loader_dri3_helper.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
+index cc890bc923..8f8efcb646 100644
+--- a/src/loader/loader_dri3_helper.c
 b/src/loader/loader_dri3_helper.c
+@@ -205,7 +205,6 @@ void
+ loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval)
+ {
+draw->swap_interval = interval;
+-   dri3_update_num_back(draw);
+ }
+ 
+ /** dri3_free_render_buffer
+@@ -377,7 +376,6 @@ dri3_handle_present_event(struct loader_dri3_drawable 
*draw,
+ draw->flipping = false;
+ break;
+  }
+- dri3_update_num_back(draw);
+ 
+  if (draw->vtable->show_fps)
+ draw->vtable->show_fps(draw, ce->ust);
+@@ -402,7 +400,8 @@ dri3_handle_present_event(struct loader_dri3_drawable 
*draw,
+ buf->busy = 0;
+ 
+  if (buf && draw->num_back <= b && b < LOADER_DRI3_MAX_BACK &&
+- draw->cur_blit_source != b) {
++ draw->cur_blit_source != b &&
++ !buf->busy) {
+ dri3_free_render_buffer(draw, buf);
+ draw->buffers[b] = NULL;
+  }
+@@ -537,6 +536,7 @@ dri3_find_back(struct loader_dri3_drawable *draw)
+/* Check whether we need to reuse the current back buffer as new back.
+ * In that case, wait until it's not busy anymore.
+ */
++   dri3_update_num_back(draw);
+num_to_consider = draw->num_back;
+if (!loader_dri3_have_image_blit(draw) && draw->cur_blit_source != -1) {
+   num_to_consider = 1;
+-- 
+2.15.1
+

Modified: PKGBUILD
===
--- PKGBUILD2018-01-12 18:55:47 UTC (rev 314641)
+++ PKGBUILD2018-01-12 18:57:35 UTC (rev 314642)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 
'mesa-vdpau' 'mesa')
 pkgver=17.3.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 
'wayland' 'wayland-protocols'
@@ -14,10 +14,12 @@
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
 LICENSE
+0001-loader-dri3-Avoid-freeing-renderbuffers-in-use.patch
 0002-glvnd-fix-gl-dot-pc.patch)
 sha256sums=('e2844a13f2d6f8f24bee65804a51c42d8dc6ae9c36cff7ee61d0940e796d64c6'
 'SKIP'
 '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+'777a5cf59eefc51fb89d60e3f6a47a7b974b794d309f6532ab107c36cd0bad19'
 

[arch-commits] Commit in mesa/trunk (2 files)

2017-10-03 Thread Andreas Radke
Date: Tuesday, October 3, 2017 @ 06:53:40
  Author: andyrtr
Revision: 306632

upgpkg: mesa 17.2.2-1

upstream update 17.2.2

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch

---+
 PKGBUILD  |   13 ++
 swr-rast-remove-llvm-fence-atomics-from-generated-files.patch |   19 --
 2 files changed, 5 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-03 05:51:37 UTC (rev 306631)
+++ PKGBUILD2017-10-03 06:53:40 UTC (rev 306632)
@@ -4,8 +4,8 @@
 
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 
'mesa-vdpau' 'mesa')
-pkgver=17.2.1
-pkgrel=3
+pkgver=17.2.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 
'wayland' 'wayland-protocols'
@@ -15,14 +15,12 @@
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
 LICENSE
 0002-glvnd-fix-gl-dot-pc.patch
-swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
-swr-rast-remove-llvm-fence-atomics-from-generated-files.patch)
-sha256sums=('77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e'
+swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch)
+sha256sums=('cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782'
 'SKIP'
 '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
 '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966'
-'2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b'
-'a747e0046eab7bb9c73444549c9c63d078b11b756d2294ba9c7ee0612caf62db')
+'2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov 

 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez 

 validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio 
Suárez Romero (Igalia, S.L.) "
@@ -36,7 +34,6 @@
   
   # swr driver
   patch -Np1 -i 
../swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
-  patch -Np1 -i 
../swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
 
   autoreconf -fiv
 }

Deleted: swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
===
--- swr-rast-remove-llvm-fence-atomics-from-generated-files.patch   
2017-10-03 05:51:37 UTC (rev 306631)
+++ swr-rast-remove-llvm-fence-atomics-from-generated-files.patch   
2017-10-03 06:53:40 UTC (rev 306632)
@@ -1,19 +0,0 @@
-diff --git a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py 
b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-index 025d38a..ce892a9 100644
 a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-+++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-@@ -140,6 +140,14 @@ def parse_ir_builder(input_file):
- 
- ignore = False
- 
-+# The following functions need to be ignored in openswr.
-+# API change in llvm-5.0 breaks baked autogen files
-+if (
-+(func_name == 'CreateFence' or
-+ func_name == 'CreateAtomicCmpXchg' or
-+ func_name == 'CreateAtomicRMW')):
-+ignore = True
-+
- # The following functions need to be ignored.
- if (func_name == 'CreateInsertNUWNSWBinOp' or
- func_name == 'CreateMaskedIntrinsic' or


[arch-commits] Commit in mesa/trunk (2 files)

2017-09-20 Thread Laurent Carlier
Date: Wednesday, September 20, 2017 @ 13:17:36
  Author: lcarlier
Revision: 305917

upgpkg: mesa 17.2.1-2

Add patch to enable swr with llvm-5.0.0

Added:
  mesa/trunk/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
Modified:
  mesa/trunk/PKGBUILD

---+
 PKGBUILD  |   12 +++---
 swr-rast-remove-llvm-fence-atomics-from-generated-files.patch |   19 ++
 2 files changed, 26 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-20 12:38:10 UTC (rev 305916)
+++ PKGBUILD2017-09-20 13:17:36 UTC (rev 305917)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 
'mesa-vdpau' 'mesa')
 pkgver=17.2.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 
'wayland' 'wayland-protocols'
@@ -15,12 +15,14 @@
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
 LICENSE
 0002-glvnd-fix-gl-dot-pc.patch
-swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch)
+swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
+swr-rast-remove-llvm-fence-atomics-from-generated-files.patch)
 sha256sums=('77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e'
 'SKIP'
 '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
 '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966'
-'2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b')
+'2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b'
+'a747e0046eab7bb9c73444549c9c63d078b11b756d2294ba9c7ee0612caf62db')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov 

 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez 

 validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio 
Suárez Romero (Igalia, S.L.) "
@@ -33,8 +35,8 @@
   patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch
   
   # swr driver
-  # but currently broken with llvm-5.0.0 
https://bugs.freedesktop.org/show_bug.cgi?id=102847
   patch -Np1 -i 
../swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
+  patch -Np1 -i 
../swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
 
   autoreconf -fiv
 }
@@ -45,7 +47,7 @@
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --with-dri-driverdir=/usr/lib/xorg/modules/dri \
---with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
+--with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \
 --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
 --with-platforms=x11,drm,wayland \
 --with-vulkan-drivers=intel,radeon \

Added: swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
===
--- swr-rast-remove-llvm-fence-atomics-from-generated-files.patch   
(rev 0)
+++ swr-rast-remove-llvm-fence-atomics-from-generated-files.patch   
2017-09-20 13:17:36 UTC (rev 305917)
@@ -0,0 +1,19 @@
+diff --git a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py 
b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
+index 025d38a..ce892a9 100644
+--- a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
 b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
+@@ -140,6 +140,14 @@ def parse_ir_builder(input_file):
+ 
+ ignore = False
+ 
++# The following functions need to be ignored in openswr.
++# API change in llvm-5.0 breaks baked autogen files
++if (
++(func_name == 'CreateFence' or
++ func_name == 'CreateAtomicCmpXchg' or
++ func_name == 'CreateAtomicRMW')):
++ignore = True
++
+ # The following functions need to be ignored.
+ if (func_name == 'CreateInsertNUWNSWBinOp' or
+ func_name == 'CreateMaskedIntrinsic' or


[arch-commits] Commit in mesa/trunk (2 files)

2016-10-27 Thread Laurent Carlier
Date: Thursday, October 27, 2016 @ 09:44:17
  Author: lcarlier
Revision: 279320

upgpkg: mesa 13.0.0rc2-1

upstream update 13.0.0-rc2 - and llvm-3.9.0 rebuild

Deleted:
  mesa/trunk/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
  mesa/trunk/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch

-+
 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch |   91 
--
 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch |   59 --
 2 files changed, 150 deletions(-)

Deleted: 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
===
--- 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-27 
09:14:57 UTC (rev 279319)
+++ 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-27 
09:44:17 UTC (rev 279320)
@@ -1,91 +0,0 @@
-From 0247e5ee3edd546b8598082d5b45d110f61853d0 Mon Sep 17 00:00:00 2001
-From: Martin Peres 
-Date: Thu, 6 Oct 2016 17:07:22 +0300
-Subject: [PATCH 1/2] loader/dri3: add get_dri_screen() to the vtable
-
-This allows querying the current active screen from the
-loader's common code.
-
-Cc: mesa-sta...@lists.freedesktop.org
-Reviewed-by: Emil Velikov 
-Signed-off-by: Martin Peres 

- src/egl/drivers/dri2/platform_x11_dri3.c | 12 
- src/glx/dri3_glx.c   | 11 +++
- src/loader/loader_dri3_helper.h  |  1 +
- 3 files changed, 24 insertions(+)
-
-diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c 
b/src/egl/drivers/dri2/platform_x11_dri3.c
-index 31649fe..d93f5bc 100644
 a/src/egl/drivers/dri2/platform_x11_dri3.c
-+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
-@@ -103,6 +103,17 @@ egl_dri3_get_dri_context(struct loader_dri3_drawable 
*draw)
-return dri2_ctx->dri_context;
- }
- 
-+static __DRIscreen *
-+egl_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
-+{
-+   _EGLContext *ctx = _eglGetCurrentContext();
-+   struct dri2_egl_context *dri2_ctx;
-+   if (!ctx)
-+  return NULL;
-+   dri2_ctx = dri2_egl_context(ctx);
-+   return dri2_egl_display(dri2_ctx->base.Resource.Display)->dri_screen;
-+}
-+
- static void
- egl_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
- {
-@@ -119,6 +130,7 @@ static struct loader_dri3_vtable egl_dri3_vtable = {
-.set_drawable_size = egl_dri3_set_drawable_size,
-.in_current_context = egl_dri3_in_current_context,
-.get_dri_context = egl_dri3_get_dri_context,
-+   .get_dri_screen = egl_dri3_get_dri_screen,
-.flush_drawable = egl_dri3_flush_drawable,
-.show_fps = NULL,
- };
-diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
-index 90d7bba..51b6b1c 100644
 a/src/glx/dri3_glx.c
-+++ b/src/glx/dri3_glx.c
-@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_dri3_drawable 
*draw)
-return (gc != ) ? dri3Ctx->driContext : NULL;
- }
- 
-+static __DRIscreen *
-+glx_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
-+{
-+   struct glx_context *gc = __glXGetCurrentContext();
-+   struct dri3_context *pcp = (struct dri3_context *) gc;
-+   struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc;
-+
-+   return (gc !=  && psc) ? psc->driScreen : NULL;
-+}
-+
- static void
- glx_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
- {
-@@ -169,6 +179,7 @@ static struct loader_dri3_vtable glx_dri3_vtable = {
-.set_drawable_size = glx_dri3_set_drawable_size,
-.in_current_context = glx_dri3_in_current_context,
-.get_dri_context = glx_dri3_get_dri_context,
-+   .get_dri_screen = glx_dri3_get_dri_screen,
-.flush_drawable = glx_dri3_flush_drawable,
-.show_fps = glx_dri3_show_fps,
- };
-diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h
-index 5b8fd1d..658e190 100644
 a/src/loader/loader_dri3_helper.h
-+++ b/src/loader/loader_dri3_helper.h
-@@ -103,6 +103,7 @@ struct loader_dri3_vtable {
-void (*set_drawable_size)(struct loader_dri3_drawable *, int, int);
-bool (*in_current_context)(struct loader_dri3_drawable *);
-__DRIcontext *(*get_dri_context)(struct loader_dri3_drawable *);
-+   __DRIscreen *(*get_dri_screen)(struct loader_dri3_drawable *);
-void (*flush_drawable)(struct loader_dri3_drawable *, unsigned);
-void (*show_fps)(struct loader_dri3_drawable *, uint64_t);
- };
--- 
-2.10.0
-

Deleted: 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
===
--- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch 
2016-10-27 09:14:57 UTC (rev 279319)
+++ 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch 
2016-10-27 09:44:17 UTC (rev 279320)
@@ -1,59 +0,0 @@
-From a599b1c2037ac8aca6c92350c8a7b3e42c81deaa Mon Sep 17 00:00:00 2001
-From: Martin Peres 

[arch-commits] Commit in mesa/trunk (2 files)

2016-08-03 Thread Laurent Carlier
Date: Wednesday, August 3, 2016 @ 14:43:20
  Author: lcarlier
Revision: 272964

upgpkg: mesa 12.0.1-6

fix FS#50240

Added:
  mesa/trunk/0001-i965-import-prime-buffers-in-the-current-context-not.patch
Modified:
  mesa/trunk/PKGBUILD

-+
 0001-i965-import-prime-buffers-in-the-current-context-not.patch |   66 
++
 PKGBUILD|   12 +
 2 files changed, 74 insertions(+), 4 deletions(-)

Added: 0001-i965-import-prime-buffers-in-the-current-context-not.patch
===
--- 0001-i965-import-prime-buffers-in-the-current-context-not.patch 
(rev 0)
+++ 0001-i965-import-prime-buffers-in-the-current-context-not.patch 
2016-08-03 14:43:20 UTC (rev 272964)
@@ -0,0 +1,66 @@
+From e180e9e3c830d3611a6cf7d32e988b4c28d20942 Mon Sep 17 00:00:00 2001
+From: Martin Peres 
+Date: Wed, 3 Aug 2016 12:58:23 +0300
+Subject: [PATCH] i965: import prime buffers in the current context, not screen
+
+This mirrors the codepath taken by DRI2 in IntelSetTexBuffer2() and
+fixes many applications when using DRI3:
+ - Totem with libva on hw-accelerated decoding
+ - obs-studio, using Window Capture (Xcomposite) as a Source
+ - gstreamer with VAAPI
+
+Cc: mesa-sta...@lists.freedesktop.org
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
+Signed-off-by: Martin Peres 
+---
+ src/mesa/drivers/dri/i965/intel_screen.c | 25 +++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/intel_screen.c 
b/src/mesa/drivers/dri/i965/intel_screen.c
+index ae51c40..169d578 100644
+--- a/src/mesa/drivers/dri/i965/intel_screen.c
 b/src/mesa/drivers/dri/i965/intel_screen.c
+@@ -702,8 +702,11 @@ intel_create_image_from_fds(__DRIscreen *screen,
+ int *fds, int num_fds, int *strides, int *offsets,
+ void *loaderPrivate)
+ {
++   GET_CURRENT_CONTEXT(ctx);
+struct intel_screen *intelScreen = screen->driverPrivate;
++   struct brw_context *brw = brw_context(ctx);
+struct intel_image_format *f;
++   dri_bufmgr *bufmgr;
+__DRIimage *image;
+int i, index;
+ 
+@@ -744,8 +747,26 @@ intel_create_image_from_fds(__DRIscreen *screen,
+  size = end;
+}
+ 
+-   image->bo = drm_intel_bo_gem_create_from_prime(intelScreen->bufmgr,
+-  fds[0], size);
++   /* Let's import the buffer into the current context instead of the current
++* screen as some applications like gstreamer, totem, or obs create 
multiple
++* X connections which end up creating multiple screens and thus multiple
++* buffer managers. They then proceed to use a different X connection than
++* the one used by the currently-bound context to call GLXBindTexImageExt()
++* which should then import the buffer in the current bound context and not
++* the current screen. This is done properly upstairs for texture 
management
++* so we need to mirror this behaviour if we don't want the kernel 
rejecting
++* our pushbuffers as the buffer would not have been imported by the same
++* buffer manager that sent the pushbuffer referencing it.
++*
++* If there is no context currently bound, then revert to using the 
screen's
++* buffer manager and hope for the best...
++*/
++   if (brw)
++   bufmgr = brw->bufmgr;
++   else
++   bufmgr = intelScreen->bufmgr;
++
++   image->bo = drm_intel_bo_gem_create_from_prime(bufmgr, fds[0], size);
+if (image->bo == NULL) {
+   free(image);
+   return NULL;
+-- 
+2.9.0
+

Modified: PKGBUILD
===
--- PKGBUILD2016-08-03 14:22:07 UTC (rev 272963)
+++ PKGBUILD2016-08-03 14:43:20 UTC (rev 272964)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 
'mesa-libgl')
 pkgver=12.0.1
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 
'wayland' 'elfutils' 'llvm'
@@ -17,7 +17,8 @@
 remove-libpthread-stubs.patch
 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch
 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch
-0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch)
+0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
+0001-i965-import-prime-buffers-in-the-current-context-not.patch)
 sha256sums=('bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389'
 'SKIP'
 '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
@@ -24,7 +25,8 @@
 

[arch-commits] Commit in mesa/trunk (2 files)

2016-07-28 Thread Laurent Carlier
Date: Thursday, July 28, 2016 @ 14:29:19
  Author: lcarlier
Revision: 272609

upgpkg: mesa 12.0.1-4

add a fix for rendering issues in overlord games

Added:
  mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
Modified:
  mesa/trunk/PKGBUILD

--+
 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch |   17 +
 PKGBUILD |   10 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

Added: 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
===
--- 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
(rev 0)
+++ 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch2016-07-28 14:29:19 UTC 
(rev 272609)
@@ -0,0 +1,17 @@
+diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp 
b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+index 7564119..38e2c4a 100644
+--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
 b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+@@ -6058,7 +6058,11 @@ st_translate_program(
+   inputSemanticName[i], inputSemanticIndex[i],
+   interpMode[i], 0, interpLocation[i],
+   array_id, array_size);
+-i += array_size - 1;
++
++GLuint base_attr = inputSlotToAttr[i];
++while (i + 1 < numInputs &&
++   inputSlotToAttr[i + 1] < base_attr + array_size)
++   ++i;
+  }
+  else {
+ t->inputs[i] = ureg_DECL_fs_input_cyl_centroid(ureg,

Modified: PKGBUILD
===
--- PKGBUILD2016-07-28 14:01:19 UTC (rev 272608)
+++ PKGBUILD2016-07-28 14:29:19 UTC (rev 272609)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 
'mesa-libgl')
 pkgver=12.0.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 
'wayland' 'elfutils' 'llvm'
@@ -16,13 +16,15 @@
 LICENSE
 remove-libpthread-stubs.patch
 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch
-0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch)
+0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch
+0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch)
 sha256sums=('bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389'
 'SKIP'
 '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c'
 'ccc8ea7f4e38f2dc26fd29150929e943aac5bc9b56bd3eddec882c6ccd1d64a5'
-'f6c17257e96182ce51b85ef75cef4f6c205b00dfbf8fc1089cd77c4a3eda6981')
+'f6c17257e96182ce51b85ef75cef4f6c205b00dfbf8fc1089cd77c4a3eda6981'
+'c1b650d2b3512d5f8f463f1974a28ed6b88e7e1936c5cfe1034ab97696d1de14')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov 

 
 prepare() {
@@ -34,6 +36,8 @@
   # fix memory leaks - merged upstream
   patch -Np1 -i ../0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch
   patch -Np1 -i ../0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch
+  # fix rendering in overlord series games
+  patch -Np1 -i ../0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
 
   autoreconf -fiv
 }


[arch-commits] Commit in mesa/trunk (2 files)

2015-10-26 Thread Laurent Carlier
Date: Monday, October 26, 2015 @ 08:57:58
  Author: lcarlier
Revision: 249766

upgpkg: mesa 11.0.4-1

upstream update 11.0.4

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-i965-Remove-early-release-of-DRI2-miptree.patch

--+
 0001-i965-Remove-early-release-of-DRI2-miptree.patch |   33 -
 PKGBUILD |   13 ++
 2 files changed, 4 insertions(+), 42 deletions(-)

Deleted: 0001-i965-Remove-early-release-of-DRI2-miptree.patch
===
--- 0001-i965-Remove-early-release-of-DRI2-miptree.patch2015-10-26 
05:54:38 UTC (rev 249765)
+++ 0001-i965-Remove-early-release-of-DRI2-miptree.patch2015-10-26 
07:57:58 UTC (rev 249766)
@@ -1,33 +0,0 @@
-From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
-From: Chris Wilson 
-Date: Fri, 10 Jul 2015 10:41:35 +0100
-Subject: [PATCH] i965: Remove early release of DRI2 miptree
-
-intel_update_winsys_renderbuffer_miptree() will release the existing
-miptree when wrapping a new DRI2 buffer, so we can remove the early
-release and so prevent a NULL mt dereference should importing the new
-DRI2 name fail for any reason. (Reusing the old DRI2 name will result
-in the rendering going astray, to a stale buffer, and not shown on the
-screen, but it allows us to issue a warning and not crash much later in
-innocent code.)
-
-Signed-off-by: Chris Wilson 

- src/mesa/drivers/dri/i965/brw_context.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/mesa/drivers/dri/i965/brw_context.c 
b/src/mesa/drivers/dri/i965/brw_context.c
-index e8d1396..72f3897 100644
 a/src/mesa/drivers/dri/i965/brw_context.c
-+++ b/src/mesa/drivers/dri/i965/brw_context.c
-@@ -1388,7 +1388,6 @@ intel_process_dri2_buffer(struct brw_context *brw,
-   buffer->cpp, buffer->pitch);
-}
- 
--   intel_miptree_release(>mt);
-bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
-   buffer->name);
-if (!bo) {
--- 
-2.5.0
-

Modified: PKGBUILD
===
--- PKGBUILD2015-10-26 05:54:38 UTC (rev 249765)
+++ PKGBUILD2015-10-26 07:57:58 UTC (rev 249766)
@@ -4,7 +4,7 @@
 
 pkgbase=mesa
 pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
-pkgver=11.0.3
+pkgver=11.0.4
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
@@ -13,20 +13,15 @@
 url="http://mesa3d.sourceforge.net;
 license=('custom')
 
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
-LICENSE
-0001-i965-Remove-early-release-of-DRI2-miptree.patch)
-sha256sums=('ab2992eece21adc23c398720ef8c6933cb69ea42e1b2611dc09d031e17e033d6'
+LICENSE)
+sha256sums=('40201bf7fc6fa12a6d9edfe870b41eb4dd6669154e3c42c48a96f70805f5483d'
 'SKIP'
-'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
-'a3f520ea13c923841c646a5b1627927744938ff691aa08e1aeaf14cce12bd1f7')
+'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov 

 
 prepare() {
   cd ${srcdir}/?esa-*
 
-  # Should fix FS#45750, tested by heftig - Not merged upstream
-  patch -Np1 -i ../0001-i965-Remove-early-release-of-DRI2-miptree.patch
-
   # Fix detection of libLLVM when built with CMake
   sed -i 's/LLVM_SO_NAME=.*/LLVM_SO_NAME=LLVM/' configure
 }


[arch-commits] Commit in mesa/trunk (2 files)

2015-08-12 Thread Laurent Carlier
Date: Wednesday, August 12, 2015 @ 23:19:56
  Author: lcarlier
Revision: 243375

upgpkg: mesa 10.6.4-1

upstream update 10.6.4, fix FS#45750 with an unofficial patch

Added:
  mesa/trunk/0001-i965-Remove-early-release-of-DRI2-miptree.patch
Modified:
  mesa/trunk/PKGBUILD

--+
 0001-i965-Remove-early-release-of-DRI2-miptree.patch |   33 +
 PKGBUILD |   16 ++--
 2 files changed, 45 insertions(+), 4 deletions(-)

Added: 0001-i965-Remove-early-release-of-DRI2-miptree.patch
===
--- 0001-i965-Remove-early-release-of-DRI2-miptree.patch
(rev 0)
+++ 0001-i965-Remove-early-release-of-DRI2-miptree.patch2015-08-12 
21:19:56 UTC (rev 243375)
@@ -0,0 +1,33 @@
+From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Fri, 10 Jul 2015 10:41:35 +0100
+Subject: [PATCH] i965: Remove early release of DRI2 miptree
+
+intel_update_winsys_renderbuffer_miptree() will release the existing
+miptree when wrapping a new DRI2 buffer, so we can remove the early
+release and so prevent a NULL mt dereference should importing the new
+DRI2 name fail for any reason. (Reusing the old DRI2 name will result
+in the rendering going astray, to a stale buffer, and not shown on the
+screen, but it allows us to issue a warning and not crash much later in
+innocent code.)
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---
+ src/mesa/drivers/dri/i965/brw_context.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c 
b/src/mesa/drivers/dri/i965/brw_context.c
+index e8d1396..72f3897 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
 b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -1388,7 +1388,6 @@ intel_process_dri2_buffer(struct brw_context *brw,
+   buffer-cpp, buffer-pitch);
+}
+ 
+-   intel_miptree_release(rb-mt);
+bo = drm_intel_bo_gem_create_from_name(brw-bufmgr, buffer_name,
+   buffer-name);
+if (!bo) {
+-- 
+2.5.0
+

Modified: PKGBUILD
===
--- PKGBUILD2015-08-12 20:30:29 UTC (rev 243374)
+++ PKGBUILD2015-08-12 21:19:56 UTC (rev 243375)
@@ -4,7 +4,7 @@
 
 pkgbase=mesa
 pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
-pkgver=10.6.3
+pkgver=10.6.4
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
@@ -13,12 +13,20 @@
 url=http://mesa3d.sourceforge.net;
 license=('custom')
 
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
-LICENSE)
-sha256sums=('58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d'
+LICENSE
+0001-i965-Remove-early-release-of-DRI2-miptree.patch)
+sha256sums=('8f5ac103f0f503de2f7a985b0df349bd4ecdfe7f51c714be146fa5a9a3c07b77'
 'SKIP'
-'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
+'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+'a3f520ea13c923841c646a5b1627927744938ff691aa08e1aeaf14cce12bd1f7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov 
emil.l.veli...@gmail.com
 
+prepare() {
+  cd ${srcdir}/?esa-*
+
+  # Should fix FS#45750, tested by heftig - Not merged upstream
+  patch -Np1 -i ../0001-i965-Remove-early-release-of-DRI2-miptree.patch
+}
 build() {
   cd ${srcdir}/?esa-*
 


[arch-commits] Commit in mesa/trunk (2 files)

2014-05-06 Thread Laurent Carlier
Date: Tuesday, May 6, 2014 @ 10:34:48
  Author: lcarlier
Revision: 212067

upgpkg: mesa 10.1.2-1

upstream update 10.1.2

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/workaround-for-robustness-and-reset-with-intel.patch

--+
 PKGBUILD |   19 -
 workaround-for-robustness-and-reset-with-intel.patch |   15 -
 2 files changed, 5 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-06 08:29:13 UTC (rev 212066)
+++ PKGBUILD2014-05-06 08:34:48 UTC (rev 212067)
@@ -4,8 +4,8 @@
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.1.1
-pkgrel=2
+pkgver=10.1.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 
'elfutils' 'llvm' 'systemd')
@@ -12,19 +12,10 @@
 url=http://mesa3d.sourceforge.net;
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-LICENSE
-workaround-for-robustness-and-reset-with-intel.patch)
-md5sums=('1fde7ed079df7aeb9b6a744ca033de8d'
- '5c65a0fe315dd347e09b1f2826a1df5a'
- 'b6b744a948b0de9cd14a2a971b7472de')
+LICENSE)
+md5sums=('28b60d15ac9f364da1e0155911eaf44e'
+ '5c65a0fe315dd347e09b1f2826a1df5a')
 
-prepare () {
-  cd ${srcdir}/?esa-*
-
-  # workaround for FS#39803 - Merged upstream for mesa 10.1.2/10.2
-  patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch
-}
-
 build() {
   cd ${srcdir}/?esa-*
 

Deleted: workaround-for-robustness-and-reset-with-intel.patch
===
--- workaround-for-robustness-and-reset-with-intel.patch2014-05-06 
08:29:13 UTC (rev 212066)
+++ workaround-for-robustness-and-reset-with-intel.patch2014-05-06 
08:34:48 UTC (rev 212067)
@@ -1,15 +0,0 @@
-diff --git a/src/mesa/drivers/dri/i965/brw_context.c 
b/src/mesa/drivers/dri/i965/brw_context.c
-index e113654..5790680 100644
 a/src/mesa/drivers/dri/i965/brw_context.c
-+++ b/src/mesa/drivers/dri/i965/brw_context.c
-@@ -645,7 +645,7 @@ brwCreateContext(gl_api api,
- 
-brw_init_driver_functions(brw, functions);
- 
--   if (notify_reset)
-+   if (notify_reset  brw-gen = 6)
-   functions.GetGraphicsResetStatus = brw_get_graphics_reset_status;
- 
-struct gl_context *ctx = brw-ctx;
-
-



[arch-commits] Commit in mesa/trunk (2 files)

2014-04-13 Thread Laurent Carlier
Date: Sunday, April 13, 2014 @ 16:05:20
  Author: lcarlier
Revision: 210290

upgpkg: mesa 10.1.0-5

add workaround for FS#39803

Added:
  mesa/trunk/workaround-for-robustness-and-reset-with-intel.patch
Modified:
  mesa/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 workaround-for-robustness-and-reset-with-intel.patch |   15 +++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-13 13:13:04 UTC (rev 210289)
+++ PKGBUILD2014-04-13 14:05:20 UTC (rev 210290)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=10.1.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'dri3proto' 'presentproto' 
  'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 
'elfutils' 'llvm' 'systemd')
@@ -12,10 +12,19 @@
 url=http://mesa3d.sourceforge.net;
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/10.1/MesaLib-${pkgver}.tar.bz2
-LICENSE)
+LICENSE
+workaround-for-robustness-and-reset-with-intel.patch)
 md5sums=('3ec43f79dbcd9aa2a4a27bf1f51655b6'
- '5c65a0fe315dd347e09b1f2826a1df5a')
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ 'b6b744a948b0de9cd14a2a971b7472de')
 
+prepare () {
+  cd ${srcdir}/?esa-*
+
+  # workaround for FS#39803 - 
https://bugs.freedesktop.org/show_bug.cgi?id=75723
+  patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch
+}
+
 build() {
   cd ${srcdir}/?esa-*
 

Added: workaround-for-robustness-and-reset-with-intel.patch
===
--- workaround-for-robustness-and-reset-with-intel.patch
(rev 0)
+++ workaround-for-robustness-and-reset-with-intel.patch2014-04-13 
14:05:20 UTC (rev 210290)
@@ -0,0 +1,15 @@
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c 
b/src/mesa/drivers/dri/i965/brw_context.c
+index e113654..5790680 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
 b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -645,7 +645,7 @@ brwCreateContext(gl_api api,
+ 
+brw_init_driver_functions(brw, functions);
+ 
+-   if (notify_reset)
++   if (notify_reset  brw-gen = 6)
+   functions.GetGraphicsResetStatus = brw_get_graphics_reset_status;
+ 
+struct gl_context *ctx = brw-ctx;
+
+



[arch-commits] Commit in mesa/trunk (2 files)

2014-01-09 Thread Laurent Carlier
Date: Thursday, January 9, 2014 @ 21:33:34
  Author: lcarlier
Revision: 203399

upgpkg: mesa 10.0.2-1

upstream update 10.0.2

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/revert.remove.GLXContextID.typedef.patch

--+
 PKGBUILD |   19 --
 revert.remove.GLXContextID.typedef.patch |   30 -
 2 files changed, 5 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-09 20:24:26 UTC (rev 203398)
+++ PKGBUILD2014-01-09 20:33:34 UTC (rev 203399)
@@ -4,8 +4,8 @@
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.0.1
-pkgrel=3
+pkgver=10.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'libxxf86vm' 'libxdamage'
  'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -12,19 +12,10 @@
 url=http://mesa3d.sourceforge.net;
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-LICENSE
-   revert.remove.GLXContextID.typedef.patch)
-md5sums=('0a72ca5b36046a658bf6038326ff32ed'
- '5c65a0fe315dd347e09b1f2826a1df5a'
- '6e49b4dd4ceb7873610f608f74efbaaf')
+LICENSE)
+md5sums=('8544c0ab3e438a08b5103421ea15b6d2'
+ '5c65a0fe315dd347e09b1f2826a1df5a')
 
-prepare() {
-  cd ${srcdir}/?esa-*
-
-  # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392)
-  patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch
-}
-
 build() {
   cd ${srcdir}/?esa-*
 

Deleted: revert.remove.GLXContextID.typedef.patch
===
--- revert.remove.GLXContextID.typedef.patch2014-01-09 20:24:26 UTC (rev 
203398)
+++ revert.remove.GLXContextID.typedef.patch2014-01-09 20:33:34 UTC (rev 
203399)
@@ -1,30 +0,0 @@
-From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001
-From: Kenneth Graunke kenn...@whitecape.org
-Date: Mon, 30 Dec 2013 07:19:36 +
-Subject: Revert mesa: Remove GLXContextID typedef from glx.h.
-
-This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1.
-
-According to belak51 on IRC, this commit broke Allegro, which would no
-longer compile.  Applications apparently expect the GLXContextID typedef
-to exist in glx.h; removing it breaks them.  A bit of searching around
-the internet revealed other complaints since upgrading to Mesa 10.
-
-Cc: 10.0 mesa-sta...@lists.freedesktop.org
-(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)

-diff --git a/include/GL/glx.h b/include/GL/glx.h
-index 62d0ede..234abc0 100644
 a/include/GL/glx.h
-+++ b/include/GL/glx.h
-@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
- /* GLX 1.3 and later */
- typedef struct __GLXFBConfigRec *GLXFBConfig;
- typedef XID GLXFBConfigID;
-+typedef XID GLXContextID;
- typedef XID GLXWindow;
- typedef XID GLXPbuffer;
- 
---
-cgit v0.9.0.2-2-gbebe
-



[arch-commits] Commit in mesa/trunk (2 files)

2014-01-05 Thread Laurent Carlier
Date: Monday, January 6, 2014 @ 08:56:06
  Author: lcarlier
Revision: 203235

upgpkg: mesa 10.0.1-2

Revert GLXContextID typedef from glx.h (FS#38392)

Added:
  mesa/trunk/revert.remove.GLXContextID.typedef.patch
Modified:
  mesa/trunk/PKGBUILD

--+
 PKGBUILD |   15 +++---
 revert.remove.GLXContextID.typedef.patch |   30 +
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-06 05:48:06 UTC (rev 203234)
+++ PKGBUILD2014-01-06 07:56:06 UTC (rev 203235)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=10.0.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'libxxf86vm' 'libxdamage'
  'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -12,10 +12,19 @@
 url=http://mesa3d.sourceforge.net;
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-LICENSE)
+LICENSE
+   revert.remove.GLXContextID.typedef.patch)
 md5sums=('0a72ca5b36046a658bf6038326ff32ed'
- '5c65a0fe315dd347e09b1f2826a1df5a')
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ '6e49b4dd4ceb7873610f608f74efbaaf')
 
+prepare() {
+  cd ${srcdir}/?esa-*
+
+  # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392)
+  patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch
+}
+
 build() {
   cd ${srcdir}/?esa-*
 

Added: revert.remove.GLXContextID.typedef.patch
===
--- revert.remove.GLXContextID.typedef.patch(rev 0)
+++ revert.remove.GLXContextID.typedef.patch2014-01-06 07:56:06 UTC (rev 
203235)
@@ -0,0 +1,30 @@
+From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke kenn...@whitecape.org
+Date: Mon, 30 Dec 2013 07:19:36 +
+Subject: Revert mesa: Remove GLXContextID typedef from glx.h.
+
+This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1.
+
+According to belak51 on IRC, this commit broke Allegro, which would no
+longer compile.  Applications apparently expect the GLXContextID typedef
+to exist in glx.h; removing it breaks them.  A bit of searching around
+the internet revealed other complaints since upgrading to Mesa 10.
+
+Cc: 10.0 mesa-sta...@lists.freedesktop.org
+(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)
+---
+diff --git a/include/GL/glx.h b/include/GL/glx.h
+index 62d0ede..234abc0 100644
+--- a/include/GL/glx.h
 b/include/GL/glx.h
+@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
+ /* GLX 1.3 and later */
+ typedef struct __GLXFBConfigRec *GLXFBConfig;
+ typedef XID GLXFBConfigID;
++typedef XID GLXContextID;
+ typedef XID GLXWindow;
+ typedef XID GLXPbuffer;
+ 
+--
+cgit v0.9.0.2-2-gbebe
+



[arch-commits] Commit in mesa/trunk (2 files)

2011-06-12 Thread Ionut Biru
Date: Sunday, June 12, 2011 @ 09:40:08
  Author: ibiru
Revision: 127296

still needed by 7.10

Added:
  mesa/trunk/gnome-shell-shader-fix.patch
  mesa/trunk/nouveau-fix-header.patch

--+
 gnome-shell-shader-fix.patch |  535 +
 nouveau-fix-header.patch |   86 ++
 2 files changed, 621 insertions(+)

Added: gnome-shell-shader-fix.patch
===
--- gnome-shell-shader-fix.patch(rev 0)
+++ gnome-shell-shader-fix.patch2011-06-12 13:40:08 UTC (rev 127296)
@@ -0,0 +1,535 @@
+From 3f625689acd570e4f14cc2ebaa43a425d13954ff Mon Sep 17 00:00:00 2001
+From: Christoph Bumiller e0425...@student.tuwien.ac.at
+Date: Thu, 31 Mar 2011 13:49:33 +
+Subject: nv50: copy regalloc fixes from nvc0
+
+Should fix gnome-shell's fade shader.
+
+Unification of the shader backend which is supposed to remove the
+code duplication is still WIP.
+---
+diff --git a/src/gallium/drivers/nv50/nv50_pc.h 
b/src/gallium/drivers/nv50/nv50_pc.h
+index e6f3815..a9a3248 100644
+--- a/src/gallium/drivers/nv50/nv50_pc.h
 b/src/gallium/drivers/nv50/nv50_pc.h
+@@ -228,6 +228,8 @@ struct nv_ref {
+ubyte flags; /* not used yet */
+ };
+ 
++#define NV_REF_FLAG_REGALLOC_PRIV (1  0)
++
+ struct nv_basic_block;
+ 
+ struct nv_instruction {
+@@ -263,6 +265,15 @@ struct nv_instruction {
+ubyte quadop;
+ };
+ 
++static INLINE int
++nvi_vector_size(struct nv_instruction *nvi)
++{
++   int i;
++   assert(nvi);
++   for (i = 0; i  4  nvi-def[i]; ++i);
++   return i;
++}
++
+ #define CFG_EDGE_FORWARD 0
+ #define CFG_EDGE_BACK1
+ #define CFG_EDGE_LOOP_ENTER  2
+diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c 
b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
+index 39ae366..657df2c 100644
+--- a/src/gallium/drivers/nv50/nv50_pc_regalloc.c
 b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
+@@ -32,14 +32,39 @@
+ #include util/u_simple_list.h
+ 
+ #define NUM_REGISTER_FILES 4
++#define MAX_REGISTER_COUNT 256
+ 
+ struct register_set {
+struct nv_pc *pc;
+ 
+uint32_t last[NUM_REGISTER_FILES];
+-   uint32_t bits[NUM_REGISTER_FILES][8];
++   uint32_t bits[NUM_REGISTER_FILES][(MAX_REGISTER_COUNT + 31) / 32];
+ };
+ 
++/* using OR because a set bit means occupied/unavailable, aliasing is allowed 
*/
++static void
++intersect_register_sets(struct register_set *dst,
++struct register_set *src1, struct register_set *src2)
++{
++   int i, j;
++
++   for (i = 0; i  NUM_REGISTER_FILES; ++i) {
++  for (j = 0; j  (MAX_REGISTER_COUNT + 31) / 32; ++j)
++ dst-bits[i][j] = src1-bits[i][j] | src2-bits[i][j];
++   }
++}
++
++static void
++mask_register_set(struct register_set *set, uint32_t mask, uint32_t umask)
++{
++   int i, j;
++
++   for (i = 0; i  NUM_REGISTER_FILES; ++i) {
++  for (j = 0; j  (MAX_REGISTER_COUNT + 31) / 32; ++j)
++ set-bits[i][j] = (set-bits[i][j] | mask)  umask;
++   }
++}
++
+ struct nv_pc_pass {
+struct nv_pc *pc;
+ 
+@@ -61,11 +86,15 @@ ranges_coalesce(struct nv_range *range)
+}
+ }
+ 
++/* @return: TRUE if @new_range can be freed (i.e. was not reused) */
+ static boolean
+ add_range_ex(struct nv_value *val, int bgn, int end, struct nv_range 
*new_range)
+ {
+struct nv_range *range, **nextp = val-livei;
+ 
++   if (bgn == end) /* [a, a) is invalid / empty */
++  return TRUE;
++
+for (range = val-livei; range; range = range-next) {
+   if (end  range-bgn)
+  break; /* insert before */
+@@ -251,6 +280,8 @@ reg_occupy(struct register_set *set, struct nv_value *val)
+id = s;
+m = (1  (1  s)) - 1;
+ 
++   assert(s = 0); /* XXX: remove me */
++
+set-bits[f][id / 32] |= m  (id % 32);
+ 
+if (set-pc-max_reg[f]  id)
+@@ -286,15 +317,12 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, 
struct nv_value *b)
+if (a-join-reg.id == b-join-reg.id)
+   return TRUE;
+ 
+-#if 1
+/* either a or b or both have been assigned */
+ 
+if (a-join-reg.id = 0  b-join-reg.id = 0)
+   return FALSE;
+else
+if (b-join-reg.id = 0) {
+-  if (a-join-reg.id = 0)
+- return FALSE;
+   val = a;
+   a = b;
+   b = val;
+@@ -309,8 +337,6 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, 
struct nv_value *b)
+  return FALSE;
+}
+return TRUE;
+-#endif
+-   return FALSE;
+ }
+ 
+ static INLINE void
+@@ -336,14 +362,14 @@ do_join_values(struct nv_pc_pass *ctx, struct nv_value 
*a, struct nv_value *b)
+assert(b-join == a-join);
+ }
+ 
+-static INLINE void
++static INLINE boolean
+ try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value 
*b)
+ {
+if (!join_allowed(ctx, a, b)) {
+ #ifdef NV50_RA_DEBUG_JOIN
+   debug_printf(cannot join %i to %i: not allowed\n, b-n, a-n);
+ #endif
+-  return;
++  return FALSE;
+}
+if (livei_have_overlap(a-join, b-join)) {
+ #ifdef