From c147d4fcf0bc739bf9f97d46ddc5f9e03c39ccba Mon Sep 17 00:00:00 2001 From: Exverge Date: Sat, 25 Jan 2025 19:47:44 -0500 Subject: [PATCH] Revert integer format color attachment fix It's out of scope of this PR, and a fix which simply supresses an error message and likely causes more issues. Revert "Latte : Temporarily disable blending for integer format color attachments" This reverts commit ee7c08e147ac001b26242200db7210fcaa640937. Revert "Latte: Disable blending integer formats" This reverts commit f4b59c967ea7bd6cbe2f7ce9cc41088fff29f37a. --- .../Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp index 03786c6d..ba094a84 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp @@ -988,6 +988,7 @@ bool PipelineCompiler::Compile(bool forceCompile, bool isRenderThread, bool show pipelineInfo.pDynamicState = &dynamicState; pipelineInfo.pRasterizationState = &rasterizer; pipelineInfo.pMultisampleState = &multisampling; + pipelineInfo.pColorBlendState = &colorBlending; pipelineInfo.layout = m_pipeline_layout; pipelineInfo.renderPass = m_renderPassObj->m_renderPass; pipelineInfo.pDepthStencilState = &depthStencilState; @@ -996,17 +997,6 @@ bool PipelineCompiler::Compile(bool forceCompile, bool isRenderThread, bool show pipelineInfo.flags = 0; if (!forceCompile) pipelineInfo.flags |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT; -#ifdef __APPLE__ - for (int i = 0; i < Latte::GPU_LIMITS::NUM_COLOR_ATTACHMENTS; ++i) - { - if (_IsVkIntegerFormat(m_renderPassObj->GetColorFormat(i))) - break; - if (i == Latte::GPU_LIMITS::NUM_COLOR_ATTACHMENTS - 1) - pipelineInfo.pColorBlendState = &colorBlending; - } -#else - pipelineInfo.pColorBlendState = &colorBlending; -#endif VkPipelineCreationFeedbackCreateInfoEXT creationFeedbackInfo; VkPipelineCreationFeedbackEXT creationFeedback;