rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

- U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch

Browse Source 
* revert severe spirv regression; emergency release will be
    available soon ...

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=939
This commit is contained in:
Stefan Dirsch 2020-04-03 08:47:54 +00:00 committed by Git OBS Bridge
parent 2832d664ce
commit bc7cb5bd77
5 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mesa-drivers.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Apr 3 08:38:51 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch
* revert severe spirv regression; emergency release will be
available soon ...
-------------------------------------------------------------------
Thu Apr 2 09:27:46 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

2
Mesa-drivers.spec
View File

@ -126,6 +126,7 @@ Source6: %{name}-rpmlintrc
Source7: Mesa.keyring
Patch1: n_opencl_dep_libclang.patch
Patch2: n_add-Mesa-headers-again.patch
Patch3: U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
@ -744,6 +745,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif
%endif
%patch2 -p1
%patch3 -p1
%patch54 -p1
%patch58 -p1

7
Mesa.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Apr 3 08:38:51 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch
* revert severe spirv regression; emergency release will be
available soon ...
-------------------------------------------------------------------
Thu Apr 2 09:27:46 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

2
Mesa.spec
View File

@ -125,6 +125,7 @@ Source6: %{name}-rpmlintrc
Source7: Mesa.keyring
Patch1: n_opencl_dep_libclang.patch
Patch2: n_add-Mesa-headers-again.patch
Patch3: U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
@ -743,6 +744,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif
%endif
%patch2 -p1
%patch3 -p1
%patch54 -p1
%patch58 -p1

52
U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch Normal file
View File

@ -0,0 +1,52 @@
From 68f325b256d96dca923f6c7d84bc6faf43911245 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Wed, 1 Apr 2020 12:40:34 -0500
Subject: [PATCH] Revert "spirv: Implement OpCopyObject and OpCopyLogical as
blind copies"
This reverts commit 7a53e67816ed9baf7d825ed60ee59f0c05f9df48.
---
src/compiler/spirv/spirv_to_nir.c | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index a60b1cba1bd..61abc727278 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -3553,30 +3553,10 @@ vtn_handle_composite(struct vtn_builder *b, SpvOp opcode,
w + 5, count - 5);
break;
+ case SpvOpCopyLogical:
case SpvOpCopyObject:
- case SpvOpCopyLogical: {
- struct vtn_value *src = vtn_untyped_value(b, w[3]);
- struct vtn_value *dst = vtn_push_value(b, w[2], src->value_type);
- if (opcode == SpvOpCopyObject) {
- vtn_fail_if(dst->type->id != src->type->id,
- "Result Type of OpCopyObject must equal Operand type");
- } else {
- assert(opcode == SpvOpCopyLogical);
- /* The logical type matching rules should guarantee we have exactly
- * the same GLSL type which means that, if it's an SSA value, we
- * don't actually need to clone it; we can just copy it blind.
- */
- vtn_fail_if(dst->type->type != src->type->type,
- "Result Type of OpCopyLogical must logically match "
- "the Operand type");
- }
- struct vtn_value src_copy = *src;
- src_copy.name = dst->name;
- src_copy.decoration = dst->decoration;
- src_copy.type = dst->type;
- *dst = src_copy;
- return;
- }
+ ssa = vtn_composite_copy(b, vtn_ssa_value(b, w[3]));
+ break;
default:
vtn_fail_with_opcode("unknown composite operation", opcode);
--
2.16.4