summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x.SRCINFO6
-rwxr-xr-xPKGBUILD6
-rw-r--r--[-rwxr-xr-x]zink_hack.patch19
3 files changed, 14 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 281b5aa61811..336a2bc651fd 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mesa-rusticl-git
pkgdesc = An open-source implementation of the OpenGL specification, with Rusticl
- pkgver = 22.3.0_devel.161123.fa759185850.61f1b507eb56fc13a58fe7134d95cdc5
+ pkgver = 22.3.0_devel.161123.fa759185850.5a0380f9e9caaef8fcede4e465e4a788
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -92,9 +92,9 @@ pkgbase = mesa-rusticl-git
source = zink_hack.patch
md5sums = SKIP
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
- md5sums = dda07c53ad6d2e1341d4d71a71e7092d
+ md5sums = b583d7eef8e4835f6e6acbbe7caf7b7e
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
- sha512sums = 6e879dd0436e5a28c11244d99935951b22dda7c3b2413942c4a97d4b763c63d25eee31112eaed2a91e9b866058ad53e981ff7ac2d44172d8c09c25209f72a6ca
+ sha512sums = 1f8c1fa1071fc00b7af67ea979ea8d5ddcaca8f28f14a58ecbccdfc784049f75092f6c69d5cd228ec100a7060f439b0bc278f2b02b32a9f51795993da18f0d65
pkgname = mesa-rusticl-git
diff --git a/PKGBUILD b/PKGBUILD
index bbfca2a83f55..64535489a1e0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=mesa-rusticl-git
pkgdesc="An open-source implementation of the OpenGL specification, with Rusticl"
-pkgver=22.3.0_devel.161123.fa759185850.61f1b507eb56fc13a58fe7134d95cdc5
+pkgver=22.3.0_devel.161123.fa759185850.5a0380f9e9caaef8fcede4e465e4a788
pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
@@ -30,11 +30,11 @@ source=('mesa::git+https://gitlab.freedesktop.org/karolherbst/mesa.git#branch=ru
)
md5sums=('SKIP'
'5c65a0fe315dd347e09b1f2826a1df5a'
- 'dda07c53ad6d2e1341d4d71a71e7092d'
+ 'b583d7eef8e4835f6e6acbbe7caf7b7e'
)
sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
- '6e879dd0436e5a28c11244d99935951b22dda7c3b2413942c4a97d4b763c63d25eee31112eaed2a91e9b866058ad53e981ff7ac2d44172d8c09c25209f72a6ca'
+ '1f8c1fa1071fc00b7af67ea979ea8d5ddcaca8f28f14a58ecbccdfc784049f75092f6c69d5cd228ec100a7060f439b0bc278f2b02b32a9f51795993da18f0d65'
)
# NINJAFLAGS is an env var used to pass commandline options to ninja
diff --git a/zink_hack.patch b/zink_hack.patch
index 506f1e3f7d63..4b965c0152df 100755..100644
--- a/zink_hack.patch
+++ b/zink_hack.patch
@@ -1,13 +1,10 @@
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
-@@ -1075,8 +1075,8 @@
- ctx->int_samplers[index] = var_id;
- }
- BITSET_SET(ctx->samplers_used, index);
-- if (mediump)
-- ctx->samplers_used_mediump |= 1 << index;
-+ // if (mediump)
-+ // ctx->samplers_used_mediump |= 1 << index;
- } else {
- ctx->image_types[index] = image_type;
- ctx->images[index] = var_id; \ No newline at end of file
+@@ -1052,6 +1052,7 @@
+ enum glsl_base_type basetype = glsl_get_sampler_result_type(type) == GLSL_TYPE_VOID ? GLSL_TYPE_FLOAT : glsl_get_sampler_result_type(type);
+ SpvId image_type;
+ SpvId var_id = create_image_var(ctx, var, bindless, basetype, &image_type);
++ bool mediump = (var->data.precision == GLSL_PRECISION_MEDIUM || var->data.precision == GLSL_PRECISION_LOW);
+
+ if (var->data.fb_fetch_output)
+ spirv_builder_emit_input_attachment_index(&ctx->builder, var_id, var->data.index);