Skip to content

Commit 82cf936

Browse files
committed
scripts: vulkaninfo generator workaround
Vulkaninfo typically ignores vendor extensions, but the video codegen was generating code that referenced VkVideoEncodingRgbConversionCapabilitiesVALVE.
1 parent 0e15c62 commit 82cf936

File tree

2 files changed

+2
-24
lines changed

2 files changed

+2
-24
lines changed

scripts/vulkaninfo_generator.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,8 @@ def genExpressionFromValue(value):
712712
out += f'{" " * 20}auto create_capabilities_chain = [&](void **ppnext) -> std::unique_ptr<video_capabilities_chain> {{\n'
713713
out += f'{" " * 20} auto capabilities_chain = std::make_unique<video_capabilities_chain>();\n'
714714
for capabilities in videoCodec.capabilities:
715+
if capabilities not in self.extension_sets['video_capabilities']:
716+
continue
715717
structDef = GetStructDef(capabilities)
716718
out += AddGuardHeader(structDef)
717719
out += f'{" " * 24}if (capabilities_chain != nullptr) {{\n'

vulkaninfo/generated/vulkaninfo.hpp

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8975,14 +8975,6 @@ std::vector<std::unique_ptr<AppVideoProfile>> enumerate_supported_video_profiles
89758975
ppnext = &capabilities_chain->VideoEncodeIntraRefreshCapabilitiesKHR.pNext;
89768976
}
89778977
}
8978-
if (capabilities_chain != nullptr) {
8979-
if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME)) {
8980-
capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE;
8981-
capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext = nullptr;
8982-
*ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE;
8983-
ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext;
8984-
}
8985-
}
89868978
if (capabilities_chain != nullptr) {
89878979
if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_VIDEO_ENCODE_H264_EXTENSION_NAME)) {
89888980
capabilities_chain->VideoEncodeH264CapabilitiesKHR.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_KHR;
@@ -9176,14 +9168,6 @@ std::vector<std::unique_ptr<AppVideoProfile>> enumerate_supported_video_profiles
91769168
ppnext = &capabilities_chain->VideoEncodeIntraRefreshCapabilitiesKHR.pNext;
91779169
}
91789170
}
9179-
if (capabilities_chain != nullptr) {
9180-
if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME)) {
9181-
capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE;
9182-
capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext = nullptr;
9183-
*ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE;
9184-
ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext;
9185-
}
9186-
}
91879171
if (capabilities_chain != nullptr) {
91889172
if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_VIDEO_ENCODE_H265_EXTENSION_NAME)) {
91899173
capabilities_chain->VideoEncodeH265CapabilitiesKHR.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_KHR;
@@ -9399,14 +9383,6 @@ std::vector<std::unique_ptr<AppVideoProfile>> enumerate_supported_video_profiles
93999383
ppnext = &capabilities_chain->VideoEncodeIntraRefreshCapabilitiesKHR.pNext;
94009384
}
94019385
}
9402-
if (capabilities_chain != nullptr) {
9403-
if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME)) {
9404-
capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE;
9405-
capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext = nullptr;
9406-
*ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE;
9407-
ppnext = &capabilities_chain->VideoEncodeRgbConversionCapabilitiesVALVE.pNext;
9408-
}
9409-
}
94109386
if (capabilities_chain != nullptr) {
94119387
if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_VIDEO_ENCODE_AV1_EXTENSION_NAME)) {
94129388
capabilities_chain->VideoEncodeAV1CapabilitiesKHR.sType = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_CAPABILITIES_KHR;

0 commit comments

Comments
 (0)