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

vulkan: use uniform shader stage masks when setting up descriptor set layouts.

Browse Source
This commit is contained in:
Sasha Szpakowski
2024-04-06 20:24:10 -03:00
parent 455d02c695
commit aded2621a3
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Shader.cpp
+17 -8
View File
@@ -113,6 +113,18 @@ static VkShaderStageFlagBits getStageBit(ShaderStageType type)
} }
} }
static VkShaderStageFlags getStageFlags(ShaderStageMask mask)
{
VkShaderStageFlags flags = 0;
if (mask & SHADERSTAGEMASK_VERTEX)
flags |= VK_SHADER_STAGE_VERTEX_BIT;
if (mask & SHADERSTAGEMASK_PIXEL)
flags |= VK_SHADER_STAGE_FRAGMENT_BIT;
if (mask & SHADERSTAGEMASK_COMPUTE)
flags |= VK_SHADER_STAGE_COMPUTE_BIT;
return flags;
}
static EShLanguage getGlslShaderType(ShaderStageType stage) static EShLanguage getGlslShaderType(ShaderStageType stage)
{ {
switch (stage) switch (stage)
@@ -876,12 +888,6 @@ void Shader::createDescriptorSetLayout()
{ {
std::vector<VkDescriptorSetLayoutBinding> bindings; std::vector<VkDescriptorSetLayoutBinding> bindings;
VkShaderStageFlags stageFlags;
if (isCompute)
stageFlags = VK_SHADER_STAGE_COMPUTE_BIT;
else
stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT;
for (auto const &entry : reflection.allUniforms) for (auto const &entry : reflection.allUniforms)
{ {
if (!entry.second->active) if (!entry.second->active)
@@ -895,7 +901,7 @@ void Shader::createDescriptorSetLayout()
layoutBinding.binding = entry.second->location; layoutBinding.binding = entry.second->location;
layoutBinding.descriptorType = type; layoutBinding.descriptorType = type;
layoutBinding.descriptorCount = entry.second->count; layoutBinding.descriptorCount = entry.second->count;
layoutBinding.stageFlags = stageFlags; layoutBinding.stageFlags = getStageFlags((ShaderStageMask)entry.second->stageMask);
bindings.push_back(layoutBinding); bindings.push_back(layoutBinding);
} }
@@ -907,7 +913,10 @@ void Shader::createDescriptorSetLayout()
uniformBinding.binding = localUniformLocation; uniformBinding.binding = localUniformLocation;
uniformBinding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; uniformBinding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
uniformBinding.descriptorCount = 1; uniformBinding.descriptorCount = 1;
uniformBinding.stageFlags = stageFlags; if (isCompute)
uniformBinding.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT;
else
uniformBinding.stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT;
bindings.push_back(uniformBinding); bindings.push_back(uniformBinding);
} }