Skip to content

Commit

Permalink
Updated to Vulkan Headers 1.3.210
Browse files Browse the repository at this point in the history
Adds support for:
- VK_EXT_graphics_pipeline_library
- VK_EXT_primitives_generated_query
- VK_VALVE_descriptor_set_host_mapping
  • Loading branch information
SaschaWillems committed Apr 3, 2022
1 parent 6b8dcb5 commit 9b577cd
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 4 deletions.
31 changes: 31 additions & 0 deletions VulkanDeviceInfoExtensions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,14 @@ void VulkanDeviceInfoExtensions::readPhysicalProperties_EXT() {
pfnGetPhysicalDeviceProperties2KHR(device, &deviceProps2);
pushProperty2(extension, "maxCustomBorderColorSamplers", QVariant(extProps.maxCustomBorderColorSamplers));
}
if (extensionSupported("VK_EXT_graphics_pipeline_library")) {
const char* extension("VK_EXT_graphics_pipeline_library");
VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT extProps { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_PROPERTIES_EXT };
VkPhysicalDeviceProperties2 deviceProps2(initDeviceProperties2(&extProps));
pfnGetPhysicalDeviceProperties2KHR(device, &deviceProps2);
pushProperty2(extension, "graphicsPipelineLibraryFastLinking", QVariant(bool(extProps.graphicsPipelineLibraryFastLinking)));
pushProperty2(extension, "graphicsPipelineLibraryIndependentInterpolationDecoration", QVariant(bool(extProps.graphicsPipelineLibraryIndependentInterpolationDecoration)));
}
if (extensionSupported("VK_EXT_fragment_density_map2")) {
const char* extension("VK_EXT_fragment_density_map2");
VkPhysicalDeviceFragmentDensityMap2PropertiesEXT extProps { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT };
Expand Down Expand Up @@ -945,6 +953,13 @@ void VulkanDeviceInfoExtensions::readPhysicalFeatures_EXT() {
pfnGetPhysicalDeviceFeatures2KHR(device, &deviceFeatures2);
pushFeature2(extension, "pipelineCreationCacheControl", extFeatures.pipelineCreationCacheControl);
}
if (extensionSupported("VK_EXT_graphics_pipeline_library")) {
const char* extension("VK_EXT_graphics_pipeline_library");
VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT extFeatures { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT };
VkPhysicalDeviceFeatures2 deviceFeatures2(initDeviceFeatures2(&extFeatures));
pfnGetPhysicalDeviceFeatures2KHR(device, &deviceFeatures2);
pushFeature2(extension, "graphicsPipelineLibrary", extFeatures.graphicsPipelineLibrary);
}
if (extensionSupported("VK_EXT_ycbcr_2plane_444_formats")) {
const char* extension("VK_EXT_ycbcr_2plane_444_formats");
VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT extFeatures { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_2_PLANE_444_FORMATS_FEATURES_EXT };
Expand Down Expand Up @@ -1019,6 +1034,15 @@ void VulkanDeviceInfoExtensions::readPhysicalFeatures_EXT() {
pfnGetPhysicalDeviceFeatures2KHR(device, &deviceFeatures2);
pushFeature2(extension, "colorWriteEnable", extFeatures.colorWriteEnable);
}
if (extensionSupported("VK_EXT_primitives_generated_query")) {
const char* extension("VK_EXT_primitives_generated_query");
VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT extFeatures { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT };
VkPhysicalDeviceFeatures2 deviceFeatures2(initDeviceFeatures2(&extFeatures));
pfnGetPhysicalDeviceFeatures2KHR(device, &deviceFeatures2);
pushFeature2(extension, "primitivesGeneratedQuery", extFeatures.primitivesGeneratedQuery);
pushFeature2(extension, "primitivesGeneratedQueryWithRasterizerDiscard", extFeatures.primitivesGeneratedQueryWithRasterizerDiscard);
pushFeature2(extension, "primitivesGeneratedQueryWithNonZeroStreams", extFeatures.primitivesGeneratedQueryWithNonZeroStreams);
}
if (extensionSupported("VK_EXT_global_priority_query")) {
const char* extension("VK_EXT_global_priority_query");
VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR extFeatures { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR };
Expand Down Expand Up @@ -1516,6 +1540,13 @@ void VulkanDeviceInfoExtensions::readPhysicalFeatures_VALVE() {
pfnGetPhysicalDeviceFeatures2KHR(device, &deviceFeatures2);
pushFeature2(extension, "mutableDescriptorType", extFeatures.mutableDescriptorType);
}
if (extensionSupported("VK_VALVE_descriptor_set_host_mapping")) {
const char* extension("VK_VALVE_descriptor_set_host_mapping");
VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE extFeatures { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE };
VkPhysicalDeviceFeatures2 deviceFeatures2(initDeviceFeatures2(&extFeatures));
pfnGetPhysicalDeviceFeatures2KHR(device, &deviceFeatures2);
pushFeature2(extension, "descriptorSetHostMapping", extFeatures.descriptorSetHostMapping);
}
}


Expand Down
2 changes: 1 addition & 1 deletion VulkanDeviceInfoExtensions.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class VulkanDeviceInfoExtensions
void readPhysicalFeatures_VALVE();

public:
const uint32_t vkHeaderVersion = 204;
const uint32_t vkHeaderVersion = 210;
std::vector<Feature2> features2;
std::vector<Property2> properties2;
std::vector<VkExtensionProperties> extensions;
Expand Down
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manifest package="de.saschawillems.vulkancapsviewer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.2" android:versionCode="25" android:installLocation="auto">
<manifest package="de.saschawillems.vulkancapsviewer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.21" android:versionCode="26" android:installLocation="auto">
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. -->
<!-- %%INSERT_PERMISSIONS -->
Expand Down
2 changes: 1 addition & 1 deletion vulkancapsviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ extern "C" const char *getWorkingFolderForiOS(void);

using std::to_string;

const QString VulkanCapsViewer::version = "3.2";
const QString VulkanCapsViewer::version = "3.21";
const QString VulkanCapsViewer::reportVersion = "3.2";

OSInfo getOperatingSystem()
Expand Down

0 comments on commit 9b577cd

Please sign in to comment.