vulkan: don't try to enable blending with integer canvases.

This commit is contained in:
Sasha Szpakowski
2024-08-14 21:00:24 -03:00
parent 9d5828a62f
commit 654585ccc2
3 changed files with 17 additions and 0 deletions
+15
View File
@@ -2346,6 +2346,7 @@ void Graphics::prepareDraw(const VertexAttributes &attributes, const BufferBindi
configuration.colorChannelMask = states.back().colorMask;
configuration.msaaSamples = renderPassState.msaa;
configuration.numColorAttachments = renderPassState.numColorAttachments;
configuration.packedColorAttachmentFormats = renderPassState.packedColorAttachmentFormats;
configuration.primitiveType = primitiveType;
if (optionalDeviceExtensions.extendedDynamicState)
@@ -2415,6 +2416,7 @@ void Graphics::setDefaultRenderPass()
renderPassState.height = static_cast<float>(swapChainExtent.height);
renderPassState.msaa = msaaSamples;
renderPassState.numColorAttachments = 1;
renderPassState.packedColorAttachmentFormats = (uint8)swapChainPixelFormat;
renderPassState.transitionImages.clear();
RenderPassConfiguration renderPassConfiguration{};
@@ -2542,6 +2544,9 @@ void Graphics::setRenderPass(const RenderTargets &rts, int pixelw, int pixelh, b
renderPassState.height = static_cast<float>(pixelh);
renderPassState.msaa = VK_SAMPLE_COUNT_1_BIT;
renderPassState.numColorAttachments = static_cast<uint32_t>(rts.colors.size());
renderPassState.packedColorAttachmentFormats = 0;
for (size_t i = 0; i < rts.colors.size(); i++)
renderPassState.packedColorAttachmentFormats |= ((uint64)rts.colors[i].texture->getPixelFormat()) << (i * 8ull);
renderPassState.transitionImages = std::move(transitionImages);
}
@@ -2783,6 +2788,16 @@ VkPipeline Graphics::createGraphicsPipeline(Shader *shader, const GraphicsPipeli
std::vector<VkPipelineColorBlendAttachmentState> colorBlendAttachments(configuration.numColorAttachments, colorBlendAttachment);
if (configuration.blendState.enable)
{
for (uint32 i = 0; i < configuration.numColorAttachments; i++)
{
PixelFormat format = (PixelFormat)((configuration.packedColorAttachmentFormats >> (i * 8ull)) & 0xFF);
if (!isPixelFormatSupported(format, PIXELFORMATUSAGEFLAGS_BLEND))
colorBlendAttachments[i].blendEnable = false;
}
}
VkPipelineColorBlendStateCreateInfo colorBlending{};
colorBlending.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
colorBlending.logicOpEnable = VK_FALSE;
+1
View File
@@ -198,6 +198,7 @@ struct RenderpassState
VkPipeline pipeline = VK_NULL_HANDLE;
std::vector<std::tuple<VkImage, PixelFormat, VkImageLayout, VkImageLayout, int, int>> transitionImages;
uint32_t numColorAttachments = 0;
uint64 packedColorAttachmentFormats = 0;
float width = 0.0f;
float height = 0.0f;
VkSampleCountFlagBits msaa = VK_SAMPLE_COUNT_1_BIT;
+1
View File
@@ -56,6 +56,7 @@ struct GraphicsPipelineConfiguration
VkSampleCountFlagBits msaaSamples;
uint32_t numColorAttachments;
PrimitiveType primitiveType;
uint64 packedColorAttachmentFormats;
struct DynamicState
{