Skip to content

Commit 791d40a

Browse files
committed
vulkan/formats: blacklist host transfers on Intel UHD 600 (GLK 2)
It seems to be failing on CI, while it passes on newer UHD 620 (WHL GT2) in my testing. So as a workaround, disable this host copy only for this failing GPU. Can be revisited later, when more information is available.
1 parent ad1d176 commit 791d40a

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/vulkan/common.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
#define VK_VENDOR_ID_APPLE 0x106B
5555
#endif
5656

57+
#ifndef VK_VENDOR_ID_INTEL
58+
#define VK_VENDOR_ID_INTEL 0x8086
59+
#endif
60+
5761
// Shared struct used to hold vulkan context information
5862
struct vk_ctx {
5963
pl_mutex lock;

src/vulkan/formats.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,12 +607,19 @@ void vk_setup_formats(struct pl_gpu_t *gpu)
607607

608608
// Internal capabilities
609609
if (vk->props.vendorID != VK_VENDOR_ID_NVIDIA &&
610-
vk->props.vendorID != VK_VENDOR_ID_APPLE) { // FIXME: remove when upstream works
610+
vk->props.vendorID != VK_VENDOR_ID_APPLE &&
611+
vk->props.vendorID != VK_VENDOR_ID_INTEL) { // FIXME: remove when upstream works
611612
if ((texflags & VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT) &&
612613
features_vk14 && features_vk14->hostImageCopy)
613614
fmtp->can_host_copy = true;
614615
}
615616

617+
// Host copy seems to fail on some Intel GPUs, particularly on our CI
618+
// machine, exclude for now this GPU.
619+
// https://gitlab.freedesktop.org/mesa/mesa/-/issues/14633
620+
if (vk->props.vendorID == VK_VENDOR_ID_INTEL && vk->props.deviceID == 0x3185)
621+
fmtp->can_host_copy = false;
622+
616623
// For blit emulation via compute shaders
617624
if (!(fmt->caps & PL_FMT_CAP_BLITTABLE) && (fmt->caps & PL_FMT_CAP_STORABLE)) {
618625
fmt->caps |= PL_FMT_CAP_BLITTABLE;

0 commit comments

Comments
 (0)