diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 312dac6c1b..73ae80d0b8 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -1677,7 +1677,7 @@ void RasterizerVulkan::UpdateBlending(Tegra::Engines::Maxwell3D::Regs& regs) { setup_enables[index] = (mask.R || mask.G || mask.B || mask.A) ? VK_TRUE : VK_FALSE; } scheduler.Record([setup_enables](vk::CommandBuffer cmdbuf) { - cmdbuf.SetColorWriteEnableEXT(0, setup_enables); + cmdbuf.SetColorWriteEnableEXT(setup_enables); }); } else { // Fallback: Use ColorWriteMask from EDS3 diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp index d8a5fe0dda..14241a2894 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.cpp +++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp @@ -127,11 +127,7 @@ void Scheduler::RequestRenderpass(const Framebuffer* framebuffer) { GPU::Logging::GPULogger::GetInstance().LogRenderPassBegin(render_pass_info); } - if (use_dynamic_rendering) { - const VkRenderingInfo rendering_info = framebuffer->RenderingInfo(); - Record([rendering_info](vk::CommandBuffer cmdbuf) { cmdbuf.BeginRendering(&rendering_info); }); - } else { - Record([renderpass, framebuffer_handle, render_area](vk::CommandBuffer cmdbuf) { + Record([renderpass, framebuffer_handle, render_area](vk::CommandBuffer cmdbuf) { const VkRenderPassBeginInfo renderpass_bi{ .sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, .pNext = nullptr, diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 07ad9007c2..903ffcefdc 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -2116,6 +2116,12 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI image.info.format); } + const VkImageViewUsageCreateInfo image_view_usage{ + .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO, + .pNext = nullptr, + .usage = ImageUsageFlags(format_info, format), + }; + VkImageViewASTCDecodeModeEXT astc_decode_mode{ .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT, .pNext = nullptr, @@ -2125,21 +2131,16 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI const void* view_pNext = &image_view_usage; if (device->IsExtASTCDecodeModeSupported() && - VideoCommon::Surface::IsPixelFormatASTC(image.info.format) && - VideoCommon::Surface::IsPixelFormatASTC(format)) { + VideoCore::Surface::IsPixelFormatASTC(image.info.format) && + VideoCore::Surface::IsPixelFormatASTC(format)) { - const bool view_is_srgb = VideoCommon::Surface::IsPixelFormatSRGB(format); - astc_decode_mode.decodeMode = view_is_srgb ? VK_FORMAT_R8G8B8A8_SRGB_PACK32 - : VK_FORMAT_R8G8B8A8_UNORM_PACK32; + const bool view_is_srgb = VideoCore::Surface::IsPixelFormatSRGB(format); + astc_decode_mode.decodeMode = view_is_srgb ? VK_FORMAT_A8B8G8R8_SRGB_PACK32 + : VK_FORMAT_A8B8G8R8_UNORM_PACK32; astc_decode_mode.pNext = view_pNext; view_pNext = &astc_decode_mode; } - const VkImageViewUsageCreateInfo image_view_usage{ - .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO, - .pNext = nullptr, - .usage = ImageUsageFlags(format_info, format), - }; const VkImageViewCreateInfo create_info{ .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, .pNext = view_pNext,