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

vulkan: implement setScissor

Browse Source
This commit is contained in:
niki
2022-07-16 23:19:24 +02:00
parent 974c50c751
commit 9b7cfef5ef
4 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Graphics.cpp
+42 -9
View File
@@ -257,10 +257,10 @@ namespace love {
capabilities.features[FEATURE_BLEND_MINMAX] = false;
capabilities.features[FEATURE_LIGHTEN] = false;
capabilities.features[FEATURE_FULL_NPOT] = false;
capabilities.features[FEATURE_PIXEL_SHADER_HIGHP] = false;
capabilities.features[FEATURE_PIXEL_SHADER_HIGHP] = true;
capabilities.features[FEATURE_SHADER_DERIVATIVES] = false;
capabilities.features[FEATURE_GLSL3] = false;
capabilities.features[FEATURE_GLSL4] = false;
capabilities.features[FEATURE_GLSL3] = true;
capabilities.features[FEATURE_GLSL4] = true;
capabilities.features[FEATURE_INSTANCING] = false;
capabilities.features[FEATURE_TEXEL_BUFFER] = false;
capabilities.features[FEATURE_INDEX_BUFFER_32BIT] = true;
@@ -389,6 +389,19 @@ namespace love {
states.back().color = c;
}
void Graphics::setScissor(const Rect& rect) {
flushBatchedDraws();
states.back().scissor = true;
states.back().scissorRect = rect;
}
void Graphics::setScissor() {
flushBatchedDraws();
states.back().scissor = false;
}
void Graphics::setWireframe(bool enable) {
flushBatchedDraws();
@@ -441,7 +454,7 @@ namespace love {
if (rts.colors.size() == 0) {
startRenderPass(nullptr, swapChainExtent.width, swapChainExtent.height);
} else {
auto firstRenderTarget = rts.getFirstTarget();
auto& firstRenderTarget = rts.getFirstTarget();
startRenderPass(static_cast<Texture*>(firstRenderTarget.texture), pixelw, pixelh);
}
}
@@ -776,6 +789,10 @@ namespace love {
score = 0;
}
if (!deviceFeatures.fillModeNonSolid) {
score = 0;
}
return score;
}
@@ -1241,6 +1258,12 @@ namespace love {
configuration.framebufferFormat = currentFramebufferOutputFormat;
configuration.viewportWidth = currentViewportWidth;
configuration.viewportHeight = currentViewportHeight;
if (states.back().scissor) {
configuration.scissorRect = states.back().scissorRect;
}
else {
configuration.scissorRect = std::nullopt;
}
std::vector<VkBuffer> bufferVector;
std::vector<VkDeviceSize> offsets;
@@ -1277,7 +1300,7 @@ namespace love {
VkRenderingAttachmentInfo colorAttachmentInfo{};
colorAttachmentInfo.sType = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO;
colorAttachmentInfo.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
colorAttachmentInfo.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
colorAttachmentInfo.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
if (texture) {
colorAttachmentInfo.imageView = texture->getImageView();
auto vulkanFormat = Vulkan::getTextureFormat(texture->getPixelFormat());
@@ -1322,8 +1345,7 @@ namespace love {
}
VkPipeline Graphics::createGraphicsPipeline(GraphicsPipelineConfiguration configuration) {
auto shader = configuration.shader;
auto shaderStages = shader->getShaderStages();
auto &shaderStages = configuration.shader->getShaderStages();
VkPipelineVertexInputStateCreateInfo vertexInputInfo{};
vertexInputInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
@@ -1346,8 +1368,16 @@ namespace love {
viewport.maxDepth = 1.0f;
VkRect2D scissor{};
scissor.offset = { 0, 0 };
scissor.extent = swapChainExtent;
if (configuration.scissorRect.has_value()) {
scissor.offset.x = configuration.scissorRect.value().x;
scissor.offset.y = configuration.scissorRect.value().y;
scissor.extent.width = static_cast<uint32_t>(configuration.scissorRect.value().w);
scissor.extent.height = static_cast<uint32_t>(configuration.scissorRect.value().h);
}
else {
scissor.offset = { 0, 0 };
scissor.extent = swapChainExtent;
}
VkPipelineViewportStateCreateInfo viewportState{};
viewportState.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
@@ -1529,6 +1559,9 @@ namespace love {
}
bool operator==(const GraphicsPipelineConfiguration& first, const GraphicsPipelineConfiguration& other) {
if (first.scissorRect != other.scissorRect) {
return false;
}
if (first.viewportHeight != other.viewportHeight) {
return false;
}
src/modules/graphics/vulkan/Graphics.h
+4 -2
View File
@@ -32,6 +32,7 @@ namespace love {
VkFormat framebufferFormat;
float viewportWidth;
float viewportHeight;
std::optional<Rect> scissorRect;
friend static bool operator==(const GraphicsPipelineConfiguration& first, const GraphicsPipelineConfiguration& other);
};
@@ -100,8 +101,8 @@ namespace love {
int getRequestedBackbufferMSAA() const override { return 0; }
int getBackbufferMSAA() const override { return 0; }
void setColor(Colorf c) override;
void setScissor(const Rect& rect) override { }
void setScissor() override { }
void setScissor(const Rect& rect) override;
void setScissor() override;
void setStencilMode(StencilAction action, CompareMode compare, int value, love::uint32 readmask, love::uint32 writemask) override { }
void setDepthMode(CompareMode compare, bool write) override { }
void setFrontFaceWinding(Winding winding) override;
@@ -217,6 +218,7 @@ namespace love {
std::vector<std::pair<DecriptorSetConfiguration, std::vector<VkDescriptorSet>>> descriptorSetsMap;
VkPolygonMode currentPolygonMode = VK_POLYGON_MODE_FILL;
// render pass variables.
VkFormat currentFramebufferOutputFormat = VK_FORMAT_UNDEFINED;
Texture* renderTargetTexture;
float currentViewportWidth = 0;