VERY experimental Nintendo Switch 2 emulator
C++
vk_texture_cache: add workaround for nullDescriptor on Mali
Liam3efaed605ce0
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cppindex de34f6d496..5dbec2e62e 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp@@ -1785,8 +1785,22 @@ ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info,: VideoCommon::ImageViewBase{info, view_info, gpu_addr_},buffer_size{VideoCommon::CalculateGuestSizeInBytes(info)} {}-ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams& params)- : VideoCommon::ImageViewBase{params} {}+ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::NullImageViewParams& params)+ : VideoCommon::ImageViewBase{params}, device{&runtime.device} {+ if (device->HasNullDescriptor()) {+ return;+ }++ // Handle fallback for devices without nullDescriptor+ ImageInfo info{};+ info.format = PixelFormat::A8B8G8R8_UNORM;++ null_image = MakeImage(*device, runtime.memory_allocator, info, {});+ image_handle = *null_image;+ for (u32 i = 0; i < Shader::NUM_TEXTURE_TYPES; i++) {+ image_views[i] = MakeView(VK_FORMAT_A8B8G8R8_UNORM_PACK32, VK_IMAGE_ASPECT_COLOR_BIT);+ }+}ImageView::~ImageView() = default;diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.hindex 7a08077098..edf5d76357 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.h+++ b/src/video_core/renderer_vulkan/vk_texture_cache.h@@ -267,6 +267,7 @@ private:vk::ImageView depth_view;vk::ImageView stencil_view;vk::ImageView color_view;+ vk::Image null_image;VkImage image_handle = VK_NULL_HANDLE;VkImageView render_target = VK_NULL_HANDLE;VkSampleCountFlagBits samples = VK_SAMPLE_COUNT_1_BIT;