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

vulkan: fix incorrect samplers

Browse Source
This commit is contained in:
niki
2022-09-19 19:51:48 +02:00
parent fe8cbfecbf
commit 58c801be58
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Graphics.cpp
+5 -5
View File
@@ -2495,10 +2495,8 @@ void Graphics::endRenderPass()
Vulkan::cmdTransitionImageLayout(commandBuffers.at(currentFrame), image, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); Vulkan::cmdTransitionImageLayout(commandBuffers.at(currentFrame), image, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
} }
VkSampler Graphics::createSampler(uint64 samplerKey) VkSampler Graphics::createSampler(const SamplerState &samplerState)
{ {
auto samplerState = SamplerState::fromKey(samplerKey);
VkSamplerCreateInfo samplerInfo{}; VkSamplerCreateInfo samplerInfo{};
samplerInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO; samplerInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
samplerInfo.magFilter = Vulkan::getFilter(samplerState.magFilter); samplerInfo.magFilter = Vulkan::getFilter(samplerState.magFilter);
@@ -2520,6 +2518,7 @@ VkSampler Graphics::createSampler(uint64 samplerKey)
samplerInfo.compareEnable = VK_FALSE; samplerInfo.compareEnable = VK_FALSE;
samplerInfo.compareOp = VK_COMPARE_OP_ALWAYS; samplerInfo.compareOp = VK_COMPARE_OP_ALWAYS;
} }
samplerInfo.compareEnable = VK_FALSE;
samplerInfo.mipmapMode = Vulkan::getMipMapMode(samplerState.mipmapFilter); samplerInfo.mipmapMode = Vulkan::getMipMapMode(samplerState.mipmapFilter);
samplerInfo.mipLodBias = samplerState.lodBias; samplerInfo.mipLodBias = samplerState.lodBias;
samplerInfo.minLod = static_cast<float>(samplerState.minLod); samplerInfo.minLod = static_cast<float>(samplerState.minLod);
@@ -2574,14 +2573,15 @@ std::set<Shader*> &Graphics::getUsedShadersInFrame()
return usedShadersInFrame; return usedShadersInFrame;
} }
VkSampler Graphics::getCachedSampler(uint64 samplerkey) VkSampler Graphics::getCachedSampler(const SamplerState &samplerState)
{ {
auto samplerkey = samplerState.toKey();
auto it = samplers.find(samplerkey); auto it = samplers.find(samplerkey);
if (it != samplers.end()) if (it != samplers.end())
return it->second; return it->second;
else else
{ {
VkSampler sampler = createSampler(samplerkey); VkSampler sampler = createSampler(samplerState);
samplers.insert({ samplerkey, sampler }); samplers.insert({ samplerkey, sampler });
return sampler; return sampler;
} }
src/modules/graphics/vulkan/Graphics.h
+2 -2
View File
@@ -308,7 +308,7 @@ public:
uint32_t getFrameIndex() const; uint32_t getFrameIndex() const;
const VkDeviceSize getMinUniformBufferOffsetAlignment() const; const VkDeviceSize getMinUniformBufferOffsetAlignment() const;
graphics::Texture *getDefaultTexture() const; graphics::Texture *getDefaultTexture() const;
VkSampler getCachedSampler(uint64); VkSampler getCachedSampler(const SamplerState &sampler);
void setComputeShader(Shader *computeShader); void setComputeShader(Shader *computeShader);
std::set<Shader*> &getUsedShadersInFrame(); std::set<Shader*> &getUsedShadersInFrame();
graphics::Shader::BuiltinUniformData getCurrentBuiltinUniformData(); graphics::Shader::BuiltinUniformData getCurrentBuiltinUniformData();
@@ -379,7 +379,7 @@ private:
void setDefaultRenderPass(); void setDefaultRenderPass();
void startRenderPass(); void startRenderPass();
void endRenderPass(); void endRenderPass();
VkSampler createSampler(uint64 samplerKey); VkSampler createSampler(const SamplerState &sampler);
void cleanupUnusedObjects(); void cleanupUnusedObjects();
uint32_t vulkanApiVersion = VK_VERSION_1_0; uint32_t vulkanApiVersion = VK_VERSION_1_0;
src/modules/graphics/vulkan/Texture.cpp
+2 -2
View File
@@ -152,7 +152,7 @@ bool Texture::loadVolatile()
clear(); clear();
createTextureImageView(); createTextureImageView();
textureSampler = vgfx->getCachedSampler(samplerState.toKey()); textureSampler = vgfx->getCachedSampler(samplerState);
if (!isPixelFormatDepthStencil(format) && mipmapCount > 1 && getMipmapsMode() != MIPMAPS_NONE) if (!isPixelFormatDepthStencil(format) && mipmapCount > 1 && getMipmapsMode() != MIPMAPS_NONE)
generateMipmaps(); generateMipmaps();
@@ -251,7 +251,7 @@ void Texture::setSamplerState(const SamplerState &s)
{ {
love::graphics::Texture::setSamplerState(s); love::graphics::Texture::setSamplerState(s);
textureSampler = vgfx->getCachedSampler(s.toKey()); textureSampler = vgfx->getCachedSampler(s);
} }
VkImageLayout Texture::getImageLayout() const VkImageLayout Texture::getImageLayout() const