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

vulkan: fix incorrect scissor when rendering to a canvas

Browse Source
This commit is contained in:
niki
2024-04-09 17:31:04 +02:00
parent 8140817107
commit 869cb23314
1 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Graphics.cpp
+37 -56
View File
@@ -972,59 +972,29 @@ void Graphics::setColor(Colorf c)
states.back().color = c; states.back().color = c;
} }
static VkRect2D computeScissor(const Rect &r, double bufferWidth, double bufferHeight, double dpiScale, VkSurfaceTransformFlagBitsKHR preTransform)
{
double x = static_cast<double>(r.x) * dpiScale;
double y = static_cast<double>(r.y) * dpiScale;
double w = static_cast<double>(r.w) * dpiScale;
double h = static_cast<double>(r.h) * dpiScale;
double scissorX, scissorY, scissorW, scissorH;
switch (preTransform)
{
case VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR:
scissorX = bufferWidth - h - y;
scissorY = x;
scissorW = h;
scissorH = w;
break;
case VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR:
scissorX = bufferWidth - w - x;
scissorY = bufferHeight - h - y;
scissorW = w;
scissorH = h;
break;
case VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR:
scissorX = y;
scissorY = bufferHeight - w - x;
scissorW = h;
scissorH = w;
break;
default:
scissorX = x;
scissorY = y;
scissorW = w;
scissorH = h;
break;
}
VkRect2D scissor = {
{static_cast<int32_t>(scissorX), static_cast<int32_t>(scissorY)},
{static_cast<uint32_t>(scissorW), static_cast<uint32_t>(scissorH)}
};
return scissor;
}
void Graphics::setScissor(const Rect &rect) void Graphics::setScissor(const Rect &rect)
{ {
flushBatchedDraws(); flushBatchedDraws();
VkRect2D scissor = computeScissor(rect, static_cast<double>(swapChainExtent.width), static_cast<double>(swapChainExtent.height), getCurrentDPIScale(), VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR);
vkCmdSetScissor(commandBuffers.at(currentFrame), 0, 1, &scissor);
states.back().scissor = true; states.back().scissor = true;
states.back().scissorRect = 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);
}
} }
void Graphics::setScissor() void Graphics::setScissor()
@@ -1033,11 +1003,22 @@ void Graphics::setScissor()
states.back().scissor = false; states.back().scissor = false;
VkRect2D scissor{}; if (renderPassState.active)
scissor.offset = { 0, 0 }; {
scissor.extent = swapChainExtent; VkRect2D scissor{};
scissor.offset = { 0, 0 };
if (renderPassState.isWindow)
scissor.extent = swapChainExtent;
else
{
double dpiScale = getCurrentDPIScale();
vkCmdSetScissor(commandBuffers.at(currentFrame), 0, 1, &scissor); scissor.extent.width = static_cast<double>(renderPassState.width) * dpiScale;
scissor.extent.height = static_cast<double>(renderPassState.height) * dpiScale;
}
vkCmdSetScissor(commandBuffers.at(currentFrame), 0, 1, &scissor);
}
} }
void Graphics::setStencilState(const StencilState &s) void Graphics::setStencilState(const StencilState &s)
@@ -1254,11 +1235,6 @@ void Graphics::setRenderTargetsInternal(const RenderTargets &rts, int pixelw, in
void Graphics::initDynamicState() void Graphics::initDynamicState()
{ {
if (states.back().scissor)
setScissor(states.back().scissorRect);
else
setScissor();
vkCmdSetStencilWriteMask(commandBuffers.at(currentFrame), VK_STENCIL_FRONT_AND_BACK, states.back().stencil.writeMask); vkCmdSetStencilWriteMask(commandBuffers.at(currentFrame), VK_STENCIL_FRONT_AND_BACK, states.back().stencil.writeMask);
vkCmdSetStencilCompareMask(commandBuffers.at(currentFrame), VK_STENCIL_FRONT_AND_BACK, states.back().stencil.readMask); vkCmdSetStencilCompareMask(commandBuffers.at(currentFrame), VK_STENCIL_FRONT_AND_BACK, states.back().stencil.readMask);
vkCmdSetStencilReference(commandBuffers.at(currentFrame), VK_STENCIL_FRONT_AND_BACK, states.back().stencil.value); vkCmdSetStencilReference(commandBuffers.at(currentFrame), VK_STENCIL_FRONT_AND_BACK, states.back().stencil.value);
@@ -2544,6 +2520,11 @@ void Graphics::startRenderPass()
if (renderPassState.isWindow && renderPassState.windowClearRequested) if (renderPassState.isWindow && renderPassState.windowClearRequested)
renderPassState.windowClearRequested = false; renderPassState.windowClearRequested = false;
if (states.back().scissor)
setScissor(states.back().scissorRect);
else
setScissor();
VkViewport viewport{}; VkViewport viewport{};
viewport.x = 0.0f; viewport.x = 0.0f;
viewport.y = 0.0f; viewport.y = 0.0f;