LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

vulkan: love.graphics.clear fixes.

Browse Source 
- Fix love.graphics.clear(color) when multiple canvases are active.
- Fix love.graphics.clear when an integer-format canvas is active.
This commit is contained in:
Sasha Szpakowski
2024-03-28 19:00:29 -03:00
parent d82922f774
commit b33afc4371
3 changed files with 60 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Texture.cpp
+30 -22
View File
@@ -383,7 +383,7 @@ void Texture::clear()
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
0, VK_REMAINING_MIP_LEVELS, 0, VK_REMAINING_ARRAY_LAYERS);
auto clearColor = getClearValue();
auto clearColor = getClearColor(this, ColorD(0, 0, 0, 0));
vkCmdClearColorImage(commandBuffer, textureImage, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &clearColor, 1, &range);
@@ -393,7 +393,7 @@ void Texture::clear()
}
else if (imageLayout == VK_IMAGE_LAYOUT_GENERAL)
{
auto clearColor = getClearValue();
auto clearColor = getClearColor(this, ColorD(0, 0, 0, 0));
vkCmdClearColorImage(commandBuffer, textureImage, VK_IMAGE_LAYOUT_GENERAL, &clearColor, 1, &range);
}
@@ -415,33 +415,41 @@ void Texture::clear()
}
}
VkClearColorValue Texture::getClearValue()
VkClearColorValue Texture::getClearColor(love::graphics::Texture *texture, const ColorD &color)
{
auto vulkanFormat = Vulkan::getTextureFormat(format);
PixelFormatType formattype = PIXELFORMATTYPE_SFLOAT;
if (texture != nullptr)
formattype = getPixelFormatInfo(texture->getPixelFormat()).dataType;
VkClearColorValue clearColor{};
switch (vulkanFormat.internalFormatRepresentation)
VkClearColorValue c{};
switch (formattype)
{
case FORMATREPRESENTATION_FLOAT:
clearColor.float32[0] = 0.0f;
clearColor.float32[1] = 0.0f;
clearColor.float32[2] = 0.0f;
clearColor.float32[3] = 0.0f;
case PIXELFORMATTYPE_SINT:
c.int32[0] = (int32)color.r;
c.int32[1] = (int32)color.g;
c.int32[2] = (int32)color.b;
c.int32[3] = (int32)color.a;
break;
case FORMATREPRESENTATION_SINT:
clearColor.int32[0] = 0;
clearColor.int32[1] = 0;
clearColor.int32[2] = 0;
clearColor.int32[3] = 0;
case PIXELFORMATTYPE_UINT:
c.uint32[0] = (uint32)color.r;
c.uint32[1] = (uint32)color.g;
c.uint32[2] = (uint32)color.b;
c.uint32[3] = (uint32)color.a;
break;
case FORMATREPRESENTATION_UINT:
clearColor.uint32[0] = 0;
clearColor.uint32[1] = 0;
clearColor.uint32[2] = 0;
clearColor.uint32[3] = 0;
default:
{
Colorf cf((float)color.r, (float)color.g, (float)color.b, (float)color.a);
gammaCorrectColor(cf);
c.float32[0] = cf.r;
c.float32[1] = cf.g;
c.float32[2] = cf.b;
c.float32[3] = cf.a;
}
break;
}
return clearColor;
return c;
}
void Texture::generateMipmapsInternal()