mirror of
https://github.com/love2d/love.git
synced 2026-08-14 10:13:46 +02:00
Don't draw if not all writable images and/or buffers are set.
This commit is contained in:
@@ -957,6 +957,11 @@ void Graphics::draw(const DrawCommand &cmd)
|
||||
{
|
||||
prepareDraw(cmd.attributesID, *cmd.buffers, cmd.texture, cmd.primitiveType, cmd.cullMode);
|
||||
|
||||
VkAccessFlags dstAccessMask;
|
||||
VkPipelineStageFlags dstStageMask;
|
||||
if (!prepareBarrier(dstAccessMask, dstStageMask))
|
||||
return;
|
||||
|
||||
if (cmd.indirectBuffer != nullptr)
|
||||
{
|
||||
vkCmdDrawIndirect(
|
||||
@@ -976,7 +981,7 @@ void Graphics::draw(const DrawCommand &cmd)
|
||||
0);
|
||||
}
|
||||
|
||||
endDraw();
|
||||
tryBarrier(dstAccessMask, dstStageMask);
|
||||
drawCalls++;
|
||||
}
|
||||
|
||||
@@ -984,6 +989,11 @@ void Graphics::draw(const DrawIndexedCommand &cmd)
|
||||
{
|
||||
prepareDraw(cmd.attributesID, *cmd.buffers, cmd.texture, cmd.primitiveType, cmd.cullMode);
|
||||
|
||||
VkAccessFlags dstAccessMask;
|
||||
VkPipelineStageFlags dstStageMask;
|
||||
if (!prepareBarrier(dstAccessMask, dstStageMask))
|
||||
return;
|
||||
|
||||
vkCmdBindIndexBuffer(
|
||||
commandBuffers.at(currentFrame),
|
||||
(VkBuffer) cmd.indexBuffer->getHandle(),
|
||||
@@ -1010,7 +1020,7 @@ void Graphics::draw(const DrawIndexedCommand &cmd)
|
||||
0);
|
||||
}
|
||||
|
||||
endDraw();
|
||||
tryBarrier(dstAccessMask, dstStageMask);
|
||||
drawCalls++;
|
||||
}
|
||||
|
||||
@@ -1021,6 +1031,12 @@ void Graphics::drawQuads(int start, int count, VertexAttributesID attributesID,
|
||||
|
||||
prepareDraw(attributesID, buffers, texture, PRIMITIVE_TRIANGLES, CULL_NONE);
|
||||
|
||||
VkAccessFlags dstAccessMask;
|
||||
VkPipelineStageFlags dstStageMask;
|
||||
if (!prepareBarrier(dstAccessMask, dstStageMask))
|
||||
return;
|
||||
|
||||
|
||||
vkCmdBindIndexBuffer(
|
||||
commandBuffers.at(currentFrame),
|
||||
(VkBuffer)quadIndexBuffer->getHandle(),
|
||||
@@ -1042,7 +1058,7 @@ void Graphics::drawQuads(int start, int count, VertexAttributesID attributesID,
|
||||
0);
|
||||
baseVertex += quadcount * 4;
|
||||
|
||||
endDraw();
|
||||
tryBarrier(dstAccessMask, dstStageMask);
|
||||
drawCalls++;
|
||||
}
|
||||
}
|
||||
@@ -2785,18 +2801,27 @@ void Graphics::prepareDraw(VertexAttributesID attributesID, const BufferBindings
|
||||
vkCmdBindVertexBuffers(commandBuffers.at(currentFrame), VERTEX_BUFFER_BINDING_START, buffercount, vkbuffers, vkoffsets);
|
||||
}
|
||||
|
||||
void Graphics::endDraw()
|
||||
bool Graphics::prepareBarrier(VkAccessFlags &dstAccessMask, VkPipelineStageFlags &dstStageMask)
|
||||
{
|
||||
auto shader = dynamic_cast<Shader *>(Shader::current);
|
||||
if (!shader)
|
||||
return false;
|
||||
|
||||
if (!shaderBarrierFlags(shader, dstAccessMask, dstStageMask))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void Graphics::tryBarrier(VkAccessFlags dstAccessMask, VkPipelineStageFlags dstStageMask)
|
||||
{
|
||||
if (dstAccessMask == 0 && dstStageMask == 0)
|
||||
return;
|
||||
|
||||
VkMemoryBarrier barrier{};
|
||||
barrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
|
||||
barrier.srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
|
||||
VkPipelineStageFlags dstStageMask = 0;
|
||||
if (!shaderBarrierFlags(shader, barrier.dstAccessMask, dstStageMask))
|
||||
return;
|
||||
barrier.dstAccessMask = dstAccessMask;
|
||||
|
||||
if (barrier.dstAccessMask != 0 || dstStageMask != 0)
|
||||
vkCmdPipelineBarrier(commandBuffers.at(currentFrame), VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, dstStageMask, 0, 1, &barrier, 0, nullptr, 0, nullptr);
|
||||
|
||||
Reference in New Issue
Block a user