AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 22:10:08 +00:00
Code Issues Projects Releases Wiki Activity

gpu: Make the texture ladder handle 32 textures

Browse Source 
So now we can put more textures in one descriptor set even if dynamic
indexing isn't supported.
This commit is contained in:
Benjamin Otte 2023-11-06 04:08:22 +01:00
parent 719ff9eca9
commit c5a01cd14b
2 changed files with 1092 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gsk/gpu/gskvulkandevice.c
View File

@ -496,16 +496,7 @@ gsk_vulkan_device_setup (GskVulkanDevice *self,
}; };
vkGetPhysicalDeviceProperties2 (display->vk_physical_device, &vk_props); vkGetPhysicalDeviceProperties2 (display->vk_physical_device, &vk_props);
/* These numbers can be improved in the shader sources by adding more if (gsk_vulkan_device_has_feature (self, GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING))
* entries to the big switch() statements */
self->max_immutable_samplers = 8;
if (!gsk_vulkan_device_has_feature (self, GDK_VULKAN_FEATURE_DYNAMIC_INDEXING) ||
!gsk_vulkan_device_has_feature (self, GDK_VULKAN_FEATURE_NONUNIFORM_INDEXING))
{
self->max_buffers = 8;
self->max_samplers = 8;
}
else if (gsk_vulkan_device_has_feature (self, GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING))
{ {
self->max_buffers = vk12_props.maxPerStageDescriptorUpdateAfterBindUniformBuffers; self->max_buffers = vk12_props.maxPerStageDescriptorUpdateAfterBindUniformBuffers;
self->max_samplers = vk12_props.maxPerStageDescriptorUpdateAfterBindSampledImages; self->max_samplers = vk12_props.maxPerStageDescriptorUpdateAfterBindSampledImages;
@ -515,6 +506,15 @@ gsk_vulkan_device_setup (GskVulkanDevice *self,
self->max_buffers = vk_props.properties.limits.maxPerStageDescriptorUniformBuffers; self->max_buffers = vk_props.properties.limits.maxPerStageDescriptorUniformBuffers;
self->max_samplers = vk_props.properties.limits.maxPerStageDescriptorSampledImages; self->max_samplers = vk_props.properties.limits.maxPerStageDescriptorSampledImages;
} }
if (!gsk_vulkan_device_has_feature (self, GDK_VULKAN_FEATURE_DYNAMIC_INDEXING) ||
!gsk_vulkan_device_has_feature (self, GDK_VULKAN_FEATURE_NONUNIFORM_INDEXING))
{
/* These numbers can be improved in the shader sources by adding more
* entries to the big if() ladders */
self->max_buffers = MIN (self->max_buffers, 32);
self->max_samplers = MIN (self->max_samplers, 32);
}
self->max_immutable_samplers = MIN (self->max_samplers, 32);
gsk_gpu_device_setup (GSK_GPU_DEVICE (self), gsk_gpu_device_setup (GSK_GPU_DEVICE (self),
display, display,
vk_props.properties.limits.maxImageDimension2D); vk_props.properties.limits.maxImageDimension2D);

1197
gsk/gpu/shaders/common-vulkan.glsl
View File

File diff suppressed because it is too large Load Diff