qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Clean up some excessive descriptor sets

Browse source 
With the switch to multi-layer textures for brush models, the bsp and
alias texture descriptor sets became identical and thus the definitions
shareable. However, due to complications I don't want to address yet,
they're still separately identified, but I should be able to use the
texture set for most, if not all, pipelines.
This commit is contained in:
Bill Currie 2021-12-14 14:39:48 +09:00
parent 0eb556b8f9
commit 2db8d11dd0
1 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libs/video/renderer/vulkan/qfpipeline.plist
View file

@ -97,21 +97,7 @@
},
);
};
alias_pool = {
flags = 0;
maxSets = 1;
bindings = (
{
type = sampler;
descriptorCount = 1;
},
{
type = sampled_image;
descriptorCount = $properties.limits.maxImages;
},
);
};
quakebsp_pool = {
texture_pool = {
flags = 0;
maxSets = 1;
bindings = (
@ -125,6 +111,9 @@
},
);
};
//FIXME probably should just share a larger pool
alias_pool = $properties.descriptorPools.texture_pool;
quakebsp_pool = $properties.descriptorPools.texture_pool;
lighting_attach_pool = {
flags = 0;
maxSets = $frames.size;
@ -187,23 +176,7 @@
},
);
};
quakebsp_set = {
bindings = (
{
binding = 0;
descriptorType = sampler;
descriptorCount = 1;
stageFlags = fragment;
},
{
binding = 1;
descriptorType = sampled_image;
descriptorCount = $properties.limits.maxImages;
stageFlags = fragment;
},
);
};
alias_set = {
texture_set = {
bindings = (
{
binding = 0;
@ -219,6 +192,8 @@
},
);
};
quakebsp_set = $properties.setLayouts.texture_set;
alias_set = $properties.setLayouts.texture_set;
lighting_attach = {
bindings = (
{