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

[Laurent Carlier]

    Date: Thursday, July 28, 2016 @ 14:40:01
  Author: lcarlier
Revision: 184558

upgpkg: lib32-mesa 12.0.1-4

add a fix for rendering issues in overlord games

Added:
  lib32-mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
Modified:
  lib32-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.patch	2016-07-28 14:40:01 UTC (rev 184558)
@@ -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
===================================================================
--- PKGBUILD	2016-07-28 13:41:25 UTC (rev 184557)
+++ PKGBUILD	2016-07-28 14:40:01 UTC (rev 184558)
@@ -5,7 +5,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
 pkgver=12.0.1
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
              'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
@@ -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 <emil.l.velikov at gmail.com>
 
 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
 }