fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Codec (Vulkan): adds showType support

Browse Source
This commit is contained in:
Carter Li
2026-06-01 18:33:14 +08:00
committed by 李通洲
parent 35428606e7
commit 37029dbbe3
3 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/codec/codec.c
+1 -1
View File
@@ -3,7 +3,7 @@
const char* ffDetectCodec(FFCodecOptions* options, FFlist* result /*list of FFCodecResult*/) {
if (options->useVulkan) {
#ifdef FF_HAVE_VULKAN
return ffDetectCodecVulkan(result);
return ffDetectCodecVulkan(options, result);
#else
FF_UNUSED(result);
return "Fastfetch was built without Vulkan support";
src/detection/codec/codec.h
+1 -1
View File
@@ -40,5 +40,5 @@ const char* ffDetectCodec(FFCodecOptions* options, FFlist* result /*list of FFCo
const char* ffDetectCodecNative(FFCodecOptions* options, FFlist* result /*list of FFCodecResult*/);
#ifdef FF_HAVE_VULKAN
const char* ffDetectCodecVulkan(FFlist* result /*list of FFCodecResult*/);
const char* ffDetectCodecVulkan(FFCodecOptions* options, FFlist* result /*list of FFCodecResult*/);
#endif
src/detection/codec/codec_vulkan.c
+18 -25
View File
@@ -2,6 +2,7 @@
#ifdef FF_HAVE_VULKAN
#include <vulkan/vulkan.h>
#include "common/strutil.h"
#if VK_KHR_video_decode_queue && VK_KHR_video_encode_queue
@@ -47,7 +48,7 @@ static FFCodecType ffCodecEncodeOperationsToTypes(VkVideoCodecOperationFlagsKHR
static bool ffCodecHasDeviceExtension(const VkExtensionProperties* extensions, uint32_t extensionCount, const char* extensionName) {
for (uint32_t i = 0; i < extensionCount; ++i) {
if (strcmp(extensions[i].extensionName, extensionName) == 0) {
if (ffStrEquals(extensions[i].extensionName, extensionName)) {
return true;
}
}
@@ -55,7 +56,7 @@ static bool ffCodecHasDeviceExtension(const VkExtensionProperties* extensions, u
return false;
}
const char* ffDetectCodecVulkan(FFlist* result /*list of FFCodecResult*/) {
const char* ffDetectCodecVulkan(FFCodecOptions* options, FFlist* result /*list of FFCodecResult*/) {
FF_DEBUG("Starting Vulkan codec detection");
FF_LIBRARY_LOAD_MESSAGE(vulkan,
@@ -151,10 +152,6 @@ const char* ffDetectCodecVulkan(FFlist* result /*list of FFCodecResult*/) {
}
FF_AUTO_FREE VkPhysicalDevice* physicalDevices = (VkPhysicalDevice*) malloc(sizeof(VkPhysicalDevice) * (size_t) physicalDeviceCount);
if (!physicalDevices) {
ffvkDestroyInstance(vkInstance, NULL);
return "malloc() failed";
}
res = ffvkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, physicalDevices);
if (res != VK_SUCCESS) {
@@ -176,23 +173,23 @@ const char* ffDetectCodecVulkan(FFlist* result /*list of FFCodecResult*/) {
continue;
}
FF_AUTO_FREE VkExtensionProperties* extensions = NULL;
if (extensionCount > 0) {
extensions = (VkExtensionProperties*) malloc(sizeof(VkExtensionProperties) * (size_t) extensionCount);
if (!extensions) {
ffvkDestroyInstance(vkInstance, NULL);
return "malloc() failed";
}
res = ffvkEnumerateDeviceExtensionProperties(physicalDevices[i], NULL, &extensionCount, extensions);
if (res != VK_SUCCESS) {
FF_DEBUG("vkEnumerateDeviceExtensionProperties(list) failed for '%s' with VkResult=%d", properties.deviceName, res);
continue;
}
if (extensionCount == 0) {
FF_DEBUG("Skipping Vulkan device '%s' because it has no extensions", properties.deviceName);
continue;
}
bool hasVideoDecode = ffCodecHasDeviceExtension(extensions, extensionCount, VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME);
bool hasVideoEncode = ffCodecHasDeviceExtension(extensions, extensionCount, VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME);
FF_AUTO_FREE VkExtensionProperties* extensions = (VkExtensionProperties*) malloc(sizeof(VkExtensionProperties) * (size_t) extensionCount);
res = ffvkEnumerateDeviceExtensionProperties(physicalDevices[i], NULL, &extensionCount, extensions);
if (res != VK_SUCCESS) {
FF_DEBUG("vkEnumerateDeviceExtensionProperties(list) failed for '%s' with VkResult=%d", properties.deviceName, res);
continue;
}
bool hasVideoDecode = (options->showType & FF_CODEC_SHOW_TYPE_DECODER) &&
ffCodecHasDeviceExtension(extensions, extensionCount, VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME);
bool hasVideoEncode = (options->showType & FF_CODEC_SHOW_TYPE_ENCODER) &&
ffCodecHasDeviceExtension(extensions, extensionCount, VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME);
if (!hasVideoDecode && !hasVideoEncode) {
FF_DEBUG("Skipping Vulkan device '%s' because it does not support video queue extensions", properties.deviceName);
@@ -209,10 +206,6 @@ const char* ffDetectCodecVulkan(FFlist* result /*list of FFCodecResult*/) {
FF_AUTO_FREE VkQueueFamilyProperties2* queueFamilyProperties = (VkQueueFamilyProperties2*) malloc(sizeof(VkQueueFamilyProperties2) * (size_t) queueFamilyCount);
FF_AUTO_FREE VkQueueFamilyVideoPropertiesKHR* queueFamilyVideoProperties = (VkQueueFamilyVideoPropertiesKHR*) malloc(sizeof(VkQueueFamilyVideoPropertiesKHR) * (size_t) queueFamilyCount);
if (!queueFamilyProperties || !queueFamilyVideoProperties) {
ffvkDestroyInstance(vkInstance, NULL);
return "malloc() failed";
}
for (uint32_t queueIndex = 0; queueIndex < queueFamilyCount; ++queueIndex) {
queueFamilyVideoProperties[queueIndex] = (VkQueueFamilyVideoPropertiesKHR){