Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

rendervulkan: Move VkPipeline creation to its own function.

Browse source
This commit is contained in:
Georg Lehmann 2022-01-31 16:39:37 +01:00 committed by Joshie
parent 3dc36c8799
commit ebc159869e
1 changed files with 67 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
src/rendervulkan.cpp
View file

@ -860,6 +860,72 @@ static bool is_vulkan_1_1_device(VkPhysicalDevice device)
return properties.apiVersion >= VK_API_VERSION_1_1; return properties.apiVersion >= VK_API_VERSION_1_1;
} }
static VkPipeline compile_vk_pipeline(uint32_t layerCount, uint32_t ycbcrMask)
{
const std::array<VkSpecializationMapEntry, 3> specializationEntries = {{
{
.constantID = 0,
.offset = 0,
.size = sizeof(uint32_t)
},
{
.constantID = 1,
.offset = sizeof(uint32_t),
.size = sizeof(uint32_t)
},
{
.constantID = 2,
.offset = sizeof(uint32_t) + sizeof(uint32_t),
.size = sizeof(uint32_t)
},
}};
struct {
uint32_t layerCount;
uint32_t ycbcrMask;
uint32_t debug;
} specializationData = {
.layerCount = layerCount + 1,
.ycbcrMask = ycbcrMask,
.debug = g_bIsCompositeDebug,
};
VkSpecializationInfo specializationInfo = {
.mapEntryCount = uint32_t(specializationEntries.size()),
.pMapEntries = specializationEntries.data(),
.dataSize = sizeof(specializationData),
.pData = &specializationData,
};
VkComputePipelineCreateInfo computePipelineCreateInfo = {
VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO,
nullptr,
0,
{
VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
nullptr,
0,
VK_SHADER_STAGE_COMPUTE_BIT,
shaderModule,
"main",
&specializationInfo
},
pipelineLayout,
0,
0
};
VkPipeline result;
VkResult res = vkCreateComputePipelines(device, 0, 1, &computePipelineCreateInfo, 0, &result);
if (res != VK_SUCCESS) {
vk_errorf( res, "vkCreateComputePipelines failed" );
return VK_NULL_HANDLE;
}
return result;
}
static bool init_device() static bool init_device()
{ {
uint32_t physicalDeviceCount = 0; uint32_t physicalDeviceCount = 0;
@ -1295,69 +1361,12 @@ retry:
return false; return false;
} }
const std::array<VkSpecializationMapEntry, 3> specializationEntries = {{
{
.constantID = 0,
.offset = 0,
.size = sizeof(uint32_t)
},
{
.constantID = 1,
.offset = sizeof(uint32_t),
.size = sizeof(uint32_t)
},
{
.constantID = 2,
.offset = sizeof(uint32_t) + sizeof(uint32_t),
.size = sizeof(uint32_t)
},
}};
for (uint32_t layerCount = 0; layerCount < k_nMaxLayers; layerCount++) { for (uint32_t layerCount = 0; layerCount < k_nMaxLayers; layerCount++) {
for (uint32_t ycbcrMask = 0; ycbcrMask < k_nMaxYcbcrMask; ycbcrMask++) { for (uint32_t ycbcrMask = 0; ycbcrMask < k_nMaxYcbcrMask; ycbcrMask++) {
if (ycbcrMask >= (1u << (layerCount + 1))) if (ycbcrMask >= (1u << (layerCount + 1)))
continue; continue;
struct { pipelines[layerCount][ycbcrMask] = compile_vk_pipeline(layerCount, ycbcrMask);
uint32_t layerCount;
uint32_t ycbcrMask;
uint32_t debug;
} specializationData = {
.layerCount = layerCount + 1,
.ycbcrMask = ycbcrMask,
.debug = g_bIsCompositeDebug,
};
VkSpecializationInfo specializationInfo = {
.mapEntryCount = uint32_t(specializationEntries.size()),
.pMapEntries = specializationEntries.data(),
.dataSize = sizeof(specializationData),
.pData = &specializationData,
};
VkComputePipelineCreateInfo computePipelineCreateInfo = {
VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO,
0,
0,
{
VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
0,
0,
VK_SHADER_STAGE_COMPUTE_BIT,
shaderModule,
"main",
&specializationInfo
},
pipelineLayout,
0,
0
};
res = vkCreateComputePipelines(device, 0, 1, &computePipelineCreateInfo, 0, &pipelines[layerCount][ycbcrMask]);
if (res != VK_SUCCESS) {
vk_errorf( res, "vkCreateComputePipelines failed" );
return false;
}
} }
} }