Attachment 251021 Details for Bug 279355 – Remove error about Queue::write_texture

[patch] Remove error about Queue::write_texture

veloren.patch (text/plain), 1.18 KB, created by Sean Farley on 2024-05-27 18:37:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Farley

Created: 2024-05-27 18:37:03 UTC

Size: 1.18 KB

patch

obsolete

>diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
>index a626be2e5a7b..f5666bf380d2 100644
>--- a/games/veloren-weekly/Makefile
>+++ b/games/veloren-weekly/Makefile
>@@ -61,6 +61,9 @@ post-patch:
> # Respect PREFIX != /usr/local for system assets
> 	@${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \
> 		${WRKSRC}/common/assets/src/lib.rs
>+	${PATCH} ${PATCH_ARGS} \
>+		-d ${WRKDIR}/wgpu-0.18-with-fixes-for-veloren-v1 < \
>+		${FILESDIR}/extra-patch-wgpu
> 
> do-install:
> # XXX [workspace.dependencies] breaks rebuild in subdirs
>diff --git a/games/veloren-weekly/files/extra-patch-wgpu b/games/veloren-weekly/files/extra-patch-wgpu
>new file mode 100644
>index 000000000000..2db7932497c4
>--- /dev/null
>+++ b/games/veloren-weekly/files/extra-patch-wgpu
>@@ -0,0 +1,13 @@
>+--- wgpu/src/backend/direct.rs.orig	2024-01-17 19:16:17.000000000 -0500
>++++ wgpu/src/backend/direct.rs	2024-02-08 20:33:55.286862000 -0500
>+@@ -2279,9 +2279,7 @@
>+             &size
>+         )) {
>+             Ok(()) => (),
>+-            Err(err) => {
>+-                self.handle_error_nolabel(&queue_data.error_sink, err, "Queue::write_texture")
>+-            }
>++            Err(_err) => ()
>+         }
>+     }
>+

Actions: View | Diff

Attachments on bug 279355: 251021 | 251029