Merge branch 'master' into format_feature_flags_2

SaschaWillems · Jul 24, 2024 · 1bdc0c4 · 1bdc0c4
2 parents 3d6f950 + b302c07
commit 1bdc0c4
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 7 deletions.
diff --git a/Vulkan-Headers b/Vulkan-Headers
diff --git a/VulkanDeviceInfoExtensions.cpp b/VulkanDeviceInfoExtensions.cpp
@@ -959,6 +959,22 @@ void VulkanDeviceInfoExtensions::readPhysicalProperties_KHR() {
 		pushProperty2(extension, "fragmentShadingRateClampCombinerInputs", QVariant(bool(extProps->fragmentShadingRateClampCombinerInputs)));
 		delete extProps;
 	}
+	if (extensionSupported("VK_KHR_maintenance7")) {
+		const char* extension("VK_KHR_maintenance7");
+		VkPhysicalDeviceMaintenance7PropertiesKHR* extProps = new VkPhysicalDeviceMaintenance7PropertiesKHR{};
+		extProps->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_PROPERTIES_KHR;
+		deviceProps2 = initDeviceProperties2(extProps);
+		vulkanContext.vkGetPhysicalDeviceProperties2KHR(device, &deviceProps2);
+		pushProperty2(extension, "robustFragmentShadingRateAttachmentAccess", QVariant(bool(extProps->robustFragmentShadingRateAttachmentAccess)));
+		pushProperty2(extension, "separateDepthStencilAttachmentAccess", QVariant(bool(extProps->separateDepthStencilAttachmentAccess)));
+		pushProperty2(extension, "maxDescriptorSetTotalUniformBuffersDynamic", QVariant(extProps->maxDescriptorSetTotalUniformBuffersDynamic));
+		pushProperty2(extension, "maxDescriptorSetTotalStorageBuffersDynamic", QVariant(extProps->maxDescriptorSetTotalStorageBuffersDynamic));
+		pushProperty2(extension, "maxDescriptorSetTotalBuffersDynamic", QVariant(extProps->maxDescriptorSetTotalBuffersDynamic));
+		pushProperty2(extension, "maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic", QVariant(extProps->maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic));
+		pushProperty2(extension, "maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic", QVariant(extProps->maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic));
+		pushProperty2(extension, "maxDescriptorSetUpdateAfterBindTotalBuffersDynamic", QVariant(extProps->maxDescriptorSetUpdateAfterBindTotalBuffersDynamic));
+		delete extProps;
+	}
 }
 void VulkanDeviceInfoExtensions::readPhysicalProperties_MESA() {
 	VkPhysicalDeviceProperties2 deviceProps2{};
@@ -2739,6 +2755,24 @@ void VulkanDeviceInfoExtensions::readPhysicalFeatures_KHR() {
 		pushFeature2(extension, "maintenance6", extFeatures->maintenance6);
 		delete extFeatures;
 	}
+	if (extensionSupported("VK_KHR_shader_relaxed_extended_instruction")) {
+		const char* extension("VK_KHR_shader_relaxed_extended_instruction");
+		VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR* extFeatures = new VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR{};
+		extFeatures->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR;
+		deviceFeatures2 = initDeviceFeatures2(extFeatures);
+		vulkanContext.vkGetPhysicalDeviceFeatures2KHR(device, &deviceFeatures2);
+		pushFeature2(extension, "shaderRelaxedExtendedInstruction", extFeatures->shaderRelaxedExtendedInstruction);
+		delete extFeatures;
+	}
+	if (extensionSupported("VK_KHR_maintenance7")) {
+		const char* extension("VK_KHR_maintenance7");
+		VkPhysicalDeviceMaintenance7FeaturesKHR* extFeatures = new VkPhysicalDeviceMaintenance7FeaturesKHR{};
+		extFeatures->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_FEATURES_KHR;
+		deviceFeatures2 = initDeviceFeatures2(extFeatures);
+		vulkanContext.vkGetPhysicalDeviceFeatures2KHR(device, &deviceFeatures2);
+		pushFeature2(extension, "maintenance7", extFeatures->maintenance7);
+		delete extFeatures;
+	}
 }
 void VulkanDeviceInfoExtensions::readPhysicalFeatures_MESA() {
 	VkPhysicalDeviceFeatures2 deviceFeatures2{};

diff --git a/VulkanDeviceInfoExtensions.h b/VulkanDeviceInfoExtensions.h
@@ -97,7 +97,7 @@ class VulkanDeviceInfoExtensions
     void readPhysicalFeatures_VALVE();
 
 public:
-    const uint32_t vkHeaderVersion = 286;
+    const uint32_t vkHeaderVersion = 289;
     std::vector<Feature2> features2;
     std::vector<Property2> properties2;
     std::vector<VkExtensionProperties> extensions;

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -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.50" android:versionCode="39" android:installLocation="auto">
+<manifest package="de.saschawillems.vulkancapsviewer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.50" android:versionCode="41" 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 -->

diff --git a/extensionlist.txt b/extensionlist.txt
@@ -171,6 +171,8 @@ VK_KHR_index_type_uint8
 VK_KHR_line_rasterization
 VK_KHR_shader_expect_assume
 VK_KHR_maintenance6
+VK_KHR_shader_relaxed_extended_instruction
+VK_KHR_maintenance7
 MESA
 VK_MESA_image_alignment_control
 MSFT

diff --git a/tools/download_releases.php b/tools/download_releases.php
@@ -7,11 +7,10 @@ function download($remote, $local) {
         fclose($remote_file);
     } else {
         throw new Exception("Could not download remote file!");
-        exit();
     }
 }
 
-$version = "3.29";
+$version = "3.42";
 $name_template = "vulkancapsviewer_".$version."_%s";
 
 # Windows 64 bit

diff --git a/vulkancapsviewer.ui b/vulkancapsviewer.ui
@@ -1382,7 +1382,7 @@ height: 24px;
          </widget>
          <widget class="QWidget" name="tab_12">
           <attribute name="title">
-           <string>Queue families</string>
+           <string>Queue Families</string>
           </attribute>
           <layout class="QVBoxLayout" name="verticalLayout_15">
            <item>
@@ -1623,7 +1623,7 @@ height: 24px;
                  </column>
                  <column>
                   <property name="text">
-                   <string>Impementation</string>
+                   <string>Implementation</string>
                   </property>
                  </column>
                  <column>