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

vulkan: properly implement samplers

Browse Source
This commit is contained in:
niki
2022-08-01 18:51:09 +02:00
parent 7bbc2888e2
commit dcea056fcb
8 changed files with 142 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Graphics.cpp
+53 -1
View File
@@ -1220,7 +1220,7 @@ void Graphics::startRenderPass(Texture* texture, uint32_t w, uint32_t h) {
colorAttachmentInfo.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
colorAttachmentInfo.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
if (texture) {
colorAttachmentInfo.imageView = texture->getImageView();
colorAttachmentInfo.imageView = (VkImageView)texture->getRenderTargetHandle();
auto vulkanFormat = Vulkan::getTextureFormat(texture->getPixelFormat());
currentFramebufferOutputFormat = vulkanFormat.internalFormat;
@@ -1262,6 +1262,53 @@ void Graphics::endRenderPass() {
}
}
VkSampler Graphics::createSampler(const SamplerState& samplerState) {
VkPhysicalDeviceProperties properties{};
vkGetPhysicalDeviceProperties(physicalDevice, &properties);
// fixme: determine actual values
VkSamplerCreateInfo samplerInfo{};
samplerInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
samplerInfo.magFilter = Vulkan::getFilter(samplerState.magFilter);
samplerInfo.minFilter = Vulkan::getFilter(samplerState.minFilter);
samplerInfo.addressModeU = Vulkan::getWrapMode(samplerState.wrapU);
samplerInfo.addressModeV = Vulkan::getWrapMode(samplerState.wrapV);
samplerInfo.addressModeW = Vulkan::getWrapMode(samplerState.wrapW);
samplerInfo.anisotropyEnable = VK_TRUE;
samplerInfo.maxAnisotropy = properties.limits.maxSamplerAnisotropy; // fixme: samplerState.maxAnisotropy
samplerInfo.borderColor = VK_BORDER_COLOR_INT_OPAQUE_BLACK;
samplerInfo.unnormalizedCoordinates = VK_FALSE;
if (samplerState.depthSampleMode.hasValue) {
samplerInfo.compareEnable = VK_TRUE;
samplerInfo.compareOp = Vulkan::getCompareOp(samplerState.depthSampleMode.value);
} else {
samplerInfo.compareEnable = VK_FALSE;
samplerInfo.compareOp = VK_COMPARE_OP_ALWAYS;
}
samplerInfo.mipmapMode = Vulkan::getMipMapMode(samplerState.mipmapFilter);
samplerInfo.mipLodBias = samplerState.lodBias;
samplerInfo.minLod = 0.0f; // fixme: samplerState.minLod
samplerInfo.maxLod = 0.0f; // fixme: samplerState.maxLod
VkSampler sampler;
if (vkCreateSampler(device, &samplerInfo, nullptr, &sampler) != VK_SUCCESS) {
throw love::Exception("failed to create sampler");
}
return sampler;
}
VkSampler Graphics::getCachedSampler(const SamplerState& samplerState) {
auto it = samplers.find(samplerState);
if (it != samplers.end()) {
return it->second;
} else {
VkSampler sampler = createSampler(samplerState);
samplers.insert({samplerState, sampler});
return sampler;
}
}
VkPipeline Graphics::createGraphicsPipeline(GraphicsPipelineConfiguration configuration) {
auto &shaderStages = configuration.shader->getShaderStages();
@@ -1496,6 +1543,11 @@ void Graphics::cleanup() {
vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
vkFreeCommandBuffers(device, commandPool, MAX_FRAMES_IN_FLIGHT, dataTransferCommandBuffers.data());
for (auto const& p : samplers) {
vkDestroySampler(device, p.second, nullptr);
}
samplers.clear();
// fixme: maybe we should clean up some pipelines if they haven't been used in a while.
for (auto const& p : graphicsPipelines) {
vkDestroyPipeline(device, p.second, nullptr);