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

vulkan: partially implement clear

Browse Source 
Only works for color attachments for now.
This commit is contained in:
niki
2022-07-16 21:45:27 +02:00
parent 4c33d0aa36
commit 974c50c751
3 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Graphics.cpp
+43 -3
View File
@@ -82,6 +82,48 @@ namespace love {
return new Buffer(this, settings, format, data, size, arraylength);
}
// FIXME: clear stencil and depth missing.
void Graphics::clear(OptionalColorD color, OptionalInt stencil, OptionalDouble depth) {
VkClearAttachment attachment{};
if (color.hasValue) {
attachment.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
attachment.clearValue.color.float32[0] = static_cast<float>(color.value.r);
attachment.clearValue.color.float32[1] = static_cast<float>(color.value.g);
attachment.clearValue.color.float32[2] = static_cast<float>(color.value.b);
attachment.clearValue.color.float32[3] = static_cast<float>(color.value.a);
}
VkClearRect rect{};
rect.layerCount = 1;
rect.rect.extent.width = currentViewportWidth;
rect.rect.extent.height = currentViewportHeight;
vkCmdClearAttachments(commandBuffers[imageIndex], 1, &attachment, 1, &rect);
}
void Graphics::clear(const std::vector<OptionalColorD>& colors, OptionalInt stencil, OptionalDouble depth) {
std::vector<VkClearAttachment> attachments;
for (const auto& color : colors) {
VkClearAttachment attachment{};
if (color.hasValue) {
attachment.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
attachment.clearValue.color.float32[0] = static_cast<float>(color.value.r);
attachment.clearValue.color.float32[1] = static_cast<float>(color.value.g);
attachment.clearValue.color.float32[2] = static_cast<float>(color.value.b);
attachment.clearValue.color.float32[3] = static_cast<float>(color.value.a);
}
attachments.push_back(attachment);
}
VkClearRect rect{};
rect.layerCount = 1;
rect.rect.extent.width = currentViewportWidth;
rect.rect.extent.height = currentViewportHeight;
vkCmdClearAttachments(commandBuffers[imageIndex], static_cast<uint32_t>(attachments.size()), attachments.data(), 1, &rect);
}
void Graphics::present(void* screenshotCallbackdata) {
flushBatchedDraws();
@@ -1235,22 +1277,20 @@ 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;
if (texture) {
colorAttachmentInfo.imageView = texture->getImageView();
colorAttachmentInfo.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; // fixme: we want to clear a canvas sometimes.
auto vulkanFormat = Vulkan::getTextureFormat(texture->getPixelFormat());
currentFramebufferOutputFormat = vulkanFormat.internalFormat;
renderTargetTexture = texture;
} else {
colorAttachmentInfo.imageView = swapChainImageViews[imageIndex];
colorAttachmentInfo.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
currentFramebufferOutputFormat = swapChainImageFormat;
renderTargetTexture = nullptr;
}
colorAttachmentInfo.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
colorAttachmentInfo.clearValue = clearColor;
VkRenderingInfo renderingInfo{};
renderingInfo.sType = VK_STRUCTURE_TYPE_RENDERING_INFO;
src/modules/graphics/vulkan/Graphics.h
+2 -3
View File
@@ -88,8 +88,8 @@ namespace love {
// implementation for virtual functions
love::graphics::Texture* newTexture(const love::graphics::Texture::Settings& settings, const love::graphics::Texture::Slices* data = nullptr) override;
love::graphics::Buffer* newBuffer(const love::graphics::Buffer::Settings& settings, const std::vector<love::graphics::Buffer::DataDeclaration>& format, const void* data, size_t size, size_t arraylength) override;
void clear(OptionalColorD color, OptionalInt stencil, OptionalDouble depth) override { }
void clear(const std::vector<OptionalColorD>& colors, OptionalInt stencil, OptionalDouble depth) override { }
void clear(OptionalColorD color, OptionalInt stencil, OptionalDouble depth) override;
void clear(const std::vector<OptionalColorD>& colors, OptionalInt stencil, OptionalDouble depth) override;
Matrix4 computeDeviceProjection(const Matrix4& projection, bool rendertotexture) const override;
void discard(const std::vector<bool>& colorbuffers, bool depthstencil) override { }
void present(void* screenshotCallbackdata) override;
@@ -198,7 +198,6 @@ namespace love {
std::vector<VkPipelineLayout> graphicsPipelineLayouts;
VkCommandPool commandPool = VK_NULL_HANDLE;
std::vector<VkCommandBuffer> commandBuffers;
VkClearValue clearColor = { {{0.0f, 0.0f, 0.0f, 1.0f}} };
VkDescriptorPool descriptorPool = VK_NULL_HANDLE;
std::vector<VkSemaphore> imageAvailableSemaphores;
std::vector<VkSemaphore> renderFinishedSemaphores;
src/modules/graphics/vulkan/ShaderStage.cpp
+2 -1
View File
@@ -162,7 +162,8 @@ namespace love {
bool forwardCompat = true;
if (!tshader->parse(&defaultTBuiltInResource, defaultVersio, defaultProfile, forceDefault, forwardCompat, EShMsgSuppressWarnings)) {
std::cout << "error while parsing shader" << std::endl;
const char* msg1 = tshader->getInfoLog();
const char* msg2 = tshader->getInfoDebugLog();
throw love::Exception("error while parsing shader");
}