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

vulkan: fix validation errors related to scissors when drawing.

Browse Source
This commit is contained in:
Sasha Szpakowski
2024-05-03 20:24:25 -03:00
parent 8d8cf317d5
commit a894c2f6a4
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Graphics.cpp
+30 -32
View File
@@ -972,6 +972,33 @@ void Graphics::setColor(Colorf c)
states.back().color = c;
}
void Graphics::applyScissor()
{
VkRect2D scissor{};
if (renderPassState.isWindow)
scissor.extent = swapChainExtent;
else
{
scissor.extent.width = renderPassState.width;
scissor.extent.height = renderPassState.height;
}
if (states.back().scissor)
{
const Rect &rect = states.back().scissorRect;
double dpiScale = getCurrentDPIScale();
// TODO: clamp this to the above viewport size.
scissor.offset.x = (int)(rect.x * dpiScale);
scissor.offset.y = (int)(rect.y * dpiScale);
scissor.extent.width = (uint32)(rect.w * dpiScale);
scissor.extent.height = (uint32)(rect.h * dpiScale);
}
vkCmdSetScissor(commandBuffers.at(currentFrame), 0, 1, &scissor);
}
void Graphics::setScissor(const Rect &rect)
{
flushBatchedDraws();
@@ -980,21 +1007,7 @@ void Graphics::setScissor(const Rect &rect)
states.back().scissorRect = rect;
if (renderPassState.active)
{
double dpiScale = getCurrentDPIScale();
double x = static_cast<double>(rect.x) * dpiScale;
double y = static_cast<double>(rect.y) * dpiScale;
double w = static_cast<double>(rect.w) * dpiScale;
double h = static_cast<double>(rect.h) * dpiScale;
VkRect2D scissor = {
{static_cast<int32_t>(x), static_cast<int32_t>(y)},
{static_cast<uint32_t>(w), static_cast<uint32_t>(h)}
};
vkCmdSetScissor(commandBuffers.at(currentFrame), 0, 1, &scissor);
}
applyScissor();
}
void Graphics::setScissor()
@@ -1004,19 +1017,7 @@ void Graphics::setScissor()
states.back().scissor = false;
if (renderPassState.active)
{
VkRect2D scissor{};
scissor.offset = { 0, 0 };
if (renderPassState.isWindow)
scissor.extent = swapChainExtent;
else
{
scissor.extent.width = renderPassState.width;
scissor.extent.height = renderPassState.height;
}
vkCmdSetScissor(commandBuffers.at(currentFrame), 0, 1, &scissor);
}
applyScissor();
}
void Graphics::setStencilState(const StencilState &s)
@@ -2550,10 +2551,7 @@ void Graphics::startRenderPass()
vkCmdBeginRenderPass(commandBuffers.at(currentFrame), &renderPassState.beginInfo, VK_SUBPASS_CONTENTS_INLINE);
if (states.back().scissor)
setScissor(states.back().scissorRect);
else
setScissor();
applyScissor();
}
void Graphics::endRenderPass()
src/modules/graphics/vulkan/Graphics.h
+1
View File
@@ -378,6 +378,7 @@ private:
void setDefaultRenderPass();
void startRenderPass();
void endRenderPass();
void applyScissor();
VkSampler createSampler(const SamplerState &sampler);
void cleanupUnusedObjects();
void requestSwapchainRecreation();