Skip to content

Commit a959b17

Browse files
ThemaisterThemaister
committed
Use Vulkan 1.4 if available.
1 parent 974c763 commit a959b17

File tree

9 files changed

+73
-33
lines changed

9 files changed

+73
-33
lines changed

‎renderer/formats/scene_formats.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ static bool mesh_unroll_vertices(Mesh &mesh)
240240
mesh.attribute_stride);
241241
}
242242
}
243-
else if (mesh.index_type == VK_INDEX_TYPE_UINT8_EXT)
243+
else if (mesh.index_type == VK_INDEX_TYPE_UINT8)
244244
{
245245
const auto *ibo = mesh.indices.data();
246246
for (unsigned i = 0; i < mesh.count; i++)
@@ -291,7 +291,7 @@ bool mesh_canonicalize_indices(SceneFormats::Mesh &mesh)
291291
for (unsigned i = 0; i < mesh.count; i++)
292292
unrolled_indices.push_back(mesh.primitive_restart && indices[i] == UINT16_MAX ? UINT32_MAX : indices[i]);
293293
}
294-
else if (mesh.index_type == VK_INDEX_TYPE_UINT8_EXT)
294+
else if (mesh.index_type == VK_INDEX_TYPE_UINT8)
295295
{
296296
auto *indices = reinterpret_cast<const uint8_t *>(mesh.indices.data());
297297
for (unsigned i = 0; i < mesh.count; i++)

‎tests/meshlet_viewer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ struct MeshletViewerApplication : Granite::Application, Granite::EventHandler //
696696

697697
cmd->set_program("assets://shaders/meshlet_debug.vert", "assets://shaders/meshlet_debug.frag",
698698
{{ "SINGLE_INSTANCE_RENDER", 0}});
699-
cmd->set_index_buffer(*ibo, 0, VK_INDEX_TYPE_UINT8_EXT);
699+
cmd->set_index_buffer(*ibo, 0, VK_INDEX_TYPE_UINT8);
700700
cmd->set_vertex_binding(0, *pos, 0, 12);
701701
cmd->set_vertex_binding(1, *attr, 0, 16);
702702
cmd->set_vertex_attrib(0, 0, VK_FORMAT_R32G32B32_SFLOAT, 0);

‎vulkan/buffer.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct BufferCreateInfo
5454
{
5555
BufferDomain domain = BufferDomain::Device;
5656
VkDeviceSize size = 0;
57-
VkBufferUsageFlags2KHR usage = 0;
57+
VkBufferUsageFlags2 usage = 0;
5858
BufferMiscFlags misc = 0;
5959
VkMemoryRequirements allocation_requirements = {};
6060
ExternalHandle external;

‎vulkan/command_buffer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2688,7 +2688,7 @@ void CommandBuffer::push_descriptor_set(uint32_t set)
26882688

26892689
VkDescriptorUpdateTemplate update_template = pipeline_state.layout->get_update_template(set);
26902690
VK_ASSERT(update_template);
2691-
table.vkCmdPushDescriptorSetWithTemplateKHR(
2691+
table.vkCmdPushDescriptorSetWithTemplate(
26922692
cmd, update_template,
26932693
pipeline_state.layout->get_layout(), set, bindings.bindings[set]);
26942694
}

‎vulkan/context.cpp‎

Lines changed: 59 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ VkApplicationInfo Context::get_promoted_application_info() const
548548
// Granite min-req is 1.1.
549549
app_info.apiVersion = std::max(VK_API_VERSION_1_1, app_info.apiVersion);
550550

551-
// Target Vulkan 1.3 if available.
552-
app_info.apiVersion = std::max(app_info.apiVersion, std::min(VK_API_VERSION_1_3, volkGetInstanceVersion()));
551+
// Target Vulkan 1.4 if available.
552+
app_info.apiVersion = std::max(app_info.apiVersion, std::min(VK_API_VERSION_1_4, volkGetInstanceVersion()));
553553

554554
return app_info;
555555
}
@@ -1338,6 +1338,33 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface,
13381338
}
13391339
}
13401340

1341+
bool supports_khr_push_descriptor = false;
1342+
1343+
if (ext.device_api_core_version >= VK_API_VERSION_1_4)
1344+
{
1345+
ADD_CHAIN(ext.vk14_features, VULKAN_1_4_FEATURES);
1346+
}
1347+
else
1348+
{
1349+
if ((flags & CONTEXT_CREATION_ENABLE_PUSH_DESCRIPTOR_BIT) != 0 && has_extension(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME))
1350+
{
1351+
enabled_extensions.push_back(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
1352+
supports_khr_push_descriptor = true;
1353+
}
1354+
1355+
if (has_extension(VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME))
1356+
{
1357+
enabled_extensions.push_back(VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME);
1358+
ADD_CHAIN(ext.index_type_uint8_features, INDEX_TYPE_UINT8_FEATURES_EXT);
1359+
}
1360+
1361+
if (has_extension(VK_KHR_MAINTENANCE_5_EXTENSION_NAME))
1362+
{
1363+
enabled_extensions.push_back(VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
1364+
ADD_CHAIN(ext.maintenance5_features, MAINTENANCE_5_FEATURES_KHR);
1365+
}
1366+
}
1367+
13411368
if (has_extension(VK_KHR_COMPUTE_SHADER_DERIVATIVES_EXTENSION_NAME))
13421369
{
13431370
enabled_extensions.push_back(VK_KHR_COMPUTE_SHADER_DERIVATIVES_EXTENSION_NAME);
@@ -1393,12 +1420,6 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface,
13931420
ADD_CHAIN(ext.mesh_shader_features, MESH_SHADER_FEATURES_EXT);
13941421
}
13951422

1396-
if (has_extension(VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME))
1397-
{
1398-
enabled_extensions.push_back(VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME);
1399-
ADD_CHAIN(ext.index_type_uint8_features, INDEX_TYPE_UINT8_FEATURES_EXT);
1400-
}
1401-
14021423
if (has_extension(VK_EXT_RGBA10X6_FORMATS_EXTENSION_NAME))
14031424
{
14041425
enabled_extensions.push_back(VK_EXT_RGBA10X6_FORMATS_EXTENSION_NAME);
@@ -1423,12 +1444,6 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface,
14231444
ADD_CHAIN(ext.video_maintenance1_features, VIDEO_MAINTENANCE_1_FEATURES_KHR);
14241445
}
14251446

1426-
if ((flags & CONTEXT_CREATION_ENABLE_PUSH_DESCRIPTOR_BIT) != 0 && has_extension(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME))
1427-
{
1428-
enabled_extensions.push_back(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
1429-
ext.supports_push_descriptor = true;
1430-
}
1431-
14321447
if (has_extension(VK_EXT_IMAGE_COMPRESSION_CONTROL_EXTENSION_NAME))
14331448
{
14341449
enabled_extensions.push_back(VK_EXT_IMAGE_COMPRESSION_CONTROL_EXTENSION_NAME);
@@ -1464,12 +1479,6 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface,
14641479
ADD_CHAIN(ext.pipeline_binary_features, PIPELINE_BINARY_FEATURES_KHR);
14651480
}
14661481

1467-
if (has_extension(VK_KHR_MAINTENANCE_5_EXTENSION_NAME))
1468-
{
1469-
enabled_extensions.push_back(VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
1470-
ADD_CHAIN(ext.maintenance5_features, MAINTENANCE_5_FEATURES_KHR);
1471-
}
1472-
14731482
if ((flags & CONTEXT_CREATION_ENABLE_ADVANCED_WSI_BIT) != 0 && requires_swapchain)
14741483
{
14751484
if (has_extension(VK_KHR_PRESENT_ID_EXTENSION_NAME))
@@ -1538,6 +1547,13 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface,
15381547
ext.vk13_features.computeFullSubgroups = VK_TRUE;
15391548
if (ext.subgroup_size_control_features.subgroupSizeControl)
15401549
ext.vk13_features.subgroupSizeControl = VK_TRUE;
1550+
1551+
if (ext.maintenance5_features.maintenance5)
1552+
ext.vk14_features.maintenance5 = VK_TRUE;
1553+
if (supports_khr_push_descriptor)
1554+
ext.vk14_features.pushDescriptor = VK_TRUE;
1555+
if (ext.index_type_uint8_features.indexTypeUint8)
1556+
ext.vk14_features.indexTypeUint8 = VK_TRUE;
15411557
///
15421558

15431559
ext.vk11_features.multiviewGeometryShader = VK_FALSE;
@@ -1554,6 +1570,24 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface,
15541570
ext.vk13_features.inlineUniformBlock = VK_FALSE;
15551571
ext.vk13_features.privateData = VK_FALSE;
15561572

1573+
// Might be relevant when we move fully to 1.4.
1574+
ext.vk14_features.dynamicRenderingLocalRead = VK_FALSE;
1575+
// TODO: Maybe later.
1576+
ext.vk14_features.hostImageCopy = VK_FALSE;
1577+
ext.vk14_features.globalPriorityQuery = VK_FALSE;
1578+
ext.vk14_features.pipelineProtectedAccess = VK_FALSE;
1579+
ext.vk14_features.pipelineRobustness = VK_FALSE;
1580+
ext.vk14_features.vertexAttributeInstanceRateDivisor = VK_FALSE;
1581+
ext.vk14_features.vertexAttributeInstanceRateZeroDivisor = VK_FALSE;
1582+
ext.vk14_features.stippledBresenhamLines = VK_FALSE;
1583+
ext.vk14_features.stippledRectangularLines = VK_FALSE;
1584+
ext.vk14_features.stippledSmoothLines = VK_FALSE;
1585+
ext.vk14_features.rectangularLines = VK_FALSE;
1586+
ext.vk14_features.smoothLines = VK_FALSE;
1587+
ext.vk14_features.bresenhamLines = VK_FALSE;
1588+
if ((flags & CONTEXT_CREATION_ENABLE_PUSH_DESCRIPTOR_BIT) == 0)
1589+
ext.vk14_features.pushDescriptor = VK_FALSE;
1590+
15571591
ext.mesh_shader_features.primitiveFragmentShadingRateMeshShader = VK_FALSE;
15581592
ext.mesh_shader_features.meshShaderQueries = VK_FALSE;
15591593
ext.mesh_shader_features.multiviewMeshShader = VK_FALSE;
@@ -1665,6 +1699,9 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface,
16651699
else if (has_extension(VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME))
16661700
ADD_CHAIN(size_control_props, SUBGROUP_SIZE_CONTROL_PROPERTIES);
16671701

1702+
if (ext.device_api_core_version >= VK_API_VERSION_1_4)
1703+
ADD_CHAIN(ext.vk14_props, VULKAN_1_4_PROPERTIES);
1704+
16681705
if (ext.supports_external_memory_host)
16691706
ADD_CHAIN(ext.host_memory_properties, EXTERNAL_MEMORY_HOST_PROPERTIES_EXT);
16701707

@@ -1777,6 +1814,8 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface,
17771814
device_table.vkCreateRenderPass2 = device_table.vkCreateRenderPass2KHR;
17781815
if (!device_table.vkResetQueryPool)
17791816
device_table.vkResetQueryPool = device_table.vkResetQueryPoolEXT;
1817+
if (!device_table.vkCmdPushDescriptorSetWithTemplate)
1818+
device_table.vkCmdPushDescriptorSetWithTemplate = device_table.vkCmdPushDescriptorSetWithTemplateKHR;
17801819

17811820
for (int i = 0; i < QUEUE_INDEX_COUNT; i++)
17821821
{

‎vulkan/context.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,17 @@ struct DeviceFeatures
7272
bool supports_swapchain_colorspace = false;
7373
bool supports_surface_maintenance1 = false;
7474
bool supports_store_op_none = false;
75-
bool supports_push_descriptor = false;
7675

7776
VkPhysicalDeviceFeatures enabled_features = {};
7877

7978
VkPhysicalDeviceVulkan11Features vk11_features = {};
8079
VkPhysicalDeviceVulkan12Features vk12_features = {};
8180
VkPhysicalDeviceVulkan13Features vk13_features = {};
81+
VkPhysicalDeviceVulkan14Features vk14_features = {};
8282
VkPhysicalDeviceVulkan11Properties vk11_props = {};
8383
VkPhysicalDeviceVulkan12Properties vk12_props = {};
8484
VkPhysicalDeviceVulkan13Properties vk13_props = {};
85+
VkPhysicalDeviceVulkan14Properties vk14_props = {};
8586

8687
// KHR
8788
VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR compute_shader_derivative_features = {};

‎vulkan/descriptor_set.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ DescriptorSetAllocator::DescriptorSetAllocator(Hash hash, Device *device_, const
183183
device->register_descriptor_set_layout(set_layout_pool, get_hash(), info);
184184
#endif
185185

186-
if (!bindless && device->get_device_features().supports_push_descriptor)
186+
if (!bindless && device->get_device_features().vk14_features.pushDescriptor)
187187
{
188-
info.flags |= VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR;
188+
info.flags |= VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT;
189189
for (auto &b : bindings)
190190
if (b.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC)
191191
b.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;

‎vulkan/device.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4368,7 +4368,7 @@ BufferHandle Device::create_imported_host_buffer(const BufferCreateInfo &create_
43684368
}
43694369

43704370
VkBufferCreateInfo info = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
4371-
VkBufferUsageFlags2CreateInfoKHR usage2 = { VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR };
4371+
VkBufferUsageFlags2CreateInfo usage2 = { VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO };
43724372
info.size = create_info.size;
43734373
usage2.usage = create_info.usage;
43744374
if (get_device_features().vk12_features.bufferDeviceAddress)
@@ -4381,7 +4381,7 @@ BufferHandle Device::create_imported_host_buffer(const BufferCreateInfo &create_
43814381
uint32_t sharing_indices[QUEUE_INDEX_COUNT];
43824382
fill_buffer_sharing_indices(info, sharing_indices);
43834383

4384-
if (ext.maintenance5_features.maintenance5)
4384+
if (ext.vk14_features.maintenance5)
43854385
{
43864386
usage2.pNext = info.pNext;
43874387
info.pNext = &usage2;
@@ -4509,7 +4509,7 @@ BufferHandle Device::create_buffer(const BufferCreateInfo &create_info, const vo
45094509
}
45104510

45114511
VkBufferCreateInfo info = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
4512-
VkBufferUsageFlags2CreateInfoKHR usage2 = { VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR };
4512+
VkBufferUsageFlags2CreateInfo usage2 = { VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO };
45134513
info.size = create_info.size;
45144514
usage2.usage = create_info.usage | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
45154515
if (get_device_features().vk12_features.bufferDeviceAddress)
@@ -4561,7 +4561,7 @@ BufferHandle Device::create_buffer(const BufferCreateInfo &create_info, const vo
45614561
info.pNext = &external_info;
45624562
}
45634563

4564-
if (ext.maintenance5_features.maintenance5)
4564+
if (ext.vk14_features.maintenance5)
45654565
{
45664566
usage2.pNext = info.pNext;
45674567
info.pNext = &usage2;

‎vulkan/shader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ void PipelineLayout::create_update_templates()
287287
if (desc_set == push_set_index)
288288
{
289289
info.descriptorSetLayout = set_allocators[desc_set]->get_layout_for_push();
290-
info.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR;
290+
info.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS;
291291
}
292292
else
293293
{

0 commit comments

Comments
 (0)