mirror of
https://github.com/fastfetch-cli/fastfetch.git
synced 2026-10-29 16:26:39 +01:00
Chore: run clang-format
```bash find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) ! -path "src/3rdparty/*" -print0 | xargs -0 clang-format -i ```
This commit is contained in:
+41
-51
@@ -5,78 +5,67 @@
|
||||
#include "detection/vulkan/vulkan.h"
|
||||
#include "modules/vulkan/vulkan.h"
|
||||
|
||||
bool ffPrintVulkan(FFVulkanOptions* options)
|
||||
{
|
||||
bool ffPrintVulkan(FFVulkanOptions* options) {
|
||||
const FFVulkanResult* vulkan = ffDetectVulkan();
|
||||
|
||||
if(vulkan->error)
|
||||
{
|
||||
if (vulkan->error) {
|
||||
ffPrintError(FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", vulkan->error);
|
||||
return false;
|
||||
}
|
||||
|
||||
if(options->moduleArgs.outputFormat.length == 0)
|
||||
{
|
||||
if (options->moduleArgs.outputFormat.length == 0) {
|
||||
ffPrintLogoAndKey(FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
|
||||
|
||||
if (vulkan->apiVersion.length == 0 && vulkan->driver.length == 0)
|
||||
{
|
||||
if (vulkan->apiVersion.length == 0 && vulkan->driver.length == 0) {
|
||||
ffStrbufWriteTo(&vulkan->instanceVersion, stdout);
|
||||
puts(" [Software only]");
|
||||
}
|
||||
else
|
||||
{
|
||||
if(vulkan->apiVersion.length > 0)
|
||||
{
|
||||
} else {
|
||||
if (vulkan->apiVersion.length > 0) {
|
||||
ffStrbufWriteTo(&vulkan->apiVersion, stdout);
|
||||
|
||||
if(vulkan->driver.length > 0)
|
||||
if (vulkan->driver.length > 0) {
|
||||
fputs(" - ", stdout);
|
||||
}
|
||||
}
|
||||
|
||||
if(vulkan->driver.length > 0)
|
||||
if (vulkan->driver.length > 0) {
|
||||
ffStrbufWriteTo(&vulkan->driver, stdout);
|
||||
}
|
||||
|
||||
putchar('\n');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
FF_PRINT_FORMAT_CHECKED(FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
|
||||
FF_ARG(vulkan->driver, "driver"),
|
||||
FF_ARG(vulkan->apiVersion, "api-version"),
|
||||
FF_ARG(vulkan->conformanceVersion, "conformance-version"),
|
||||
FF_ARG(vulkan->instanceVersion, "instance-version"),
|
||||
}));
|
||||
FF_ARG(vulkan->driver, "driver"),
|
||||
FF_ARG(vulkan->apiVersion, "api-version"),
|
||||
FF_ARG(vulkan->conformanceVersion, "conformance-version"),
|
||||
FF_ARG(vulkan->instanceVersion, "instance-version"),
|
||||
}));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ffParseVulkanJsonObject(FFVulkanOptions* options, yyjson_val* module)
|
||||
{
|
||||
void ffParseVulkanJsonObject(FFVulkanOptions* options, yyjson_val* module) {
|
||||
yyjson_val *key, *val;
|
||||
size_t idx, max;
|
||||
yyjson_obj_foreach(module, idx, max, key, val)
|
||||
{
|
||||
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
|
||||
yyjson_obj_foreach (module, idx, max, key, val) {
|
||||
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
ffPrintError(FF_VULKAN_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
|
||||
}
|
||||
}
|
||||
|
||||
void ffGenerateVulkanJsonConfig(FFVulkanOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
|
||||
{
|
||||
void ffGenerateVulkanJsonConfig(FFVulkanOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
|
||||
ffJsonConfigGenerateModuleArgsConfig(doc, module, &options->moduleArgs);
|
||||
}
|
||||
|
||||
bool ffGenerateVulkanJsonResult(FF_MAYBE_UNUSED FFVulkanOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
|
||||
{
|
||||
bool ffGenerateVulkanJsonResult(FF_MAYBE_UNUSED FFVulkanOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
|
||||
const FFVulkanResult* result = ffDetectVulkan();
|
||||
|
||||
if(result->error)
|
||||
{
|
||||
if (result->error) {
|
||||
yyjson_mut_obj_add_str(doc, module, "error", result->error);
|
||||
return false;
|
||||
}
|
||||
@@ -86,10 +75,10 @@ bool ffGenerateVulkanJsonResult(FF_MAYBE_UNUSED FFVulkanOptions* options, yyjson
|
||||
yyjson_mut_obj_add_strbuf(doc, obj, "conformanceVersion", &result->conformanceVersion);
|
||||
yyjson_mut_obj_add_strbuf(doc, obj, "driver", &result->driver);
|
||||
yyjson_mut_val* gpus = yyjson_mut_obj_add_arr(doc, obj, "gpus");
|
||||
FF_LIST_FOR_EACH(FFGPUResult, vulkanGpu, result->gpus)
|
||||
{
|
||||
FF_LIST_FOR_EACH (FFGPUResult, vulkanGpu, result->gpus) {
|
||||
yyjson_mut_val* gpuObj = yyjson_mut_arr_add_obj(doc, gpus);
|
||||
yyjson_mut_obj_add_str(doc, gpuObj, "type", vulkanGpu->type == FF_GPU_TYPE_UNKNOWN ? "Unknown" : vulkanGpu->type == FF_GPU_TYPE_INTEGRATED ? "Integrated" : "Discrete");
|
||||
yyjson_mut_obj_add_str(doc, gpuObj, "type", vulkanGpu->type == FF_GPU_TYPE_UNKNOWN ? "Unknown" : vulkanGpu->type == FF_GPU_TYPE_INTEGRATED ? "Integrated"
|
||||
: "Discrete");
|
||||
yyjson_mut_obj_add_strbuf(doc, gpuObj, "vendor", &vulkanGpu->vendor);
|
||||
yyjson_mut_obj_add_strbuf(doc, gpuObj, "name", &vulkanGpu->name);
|
||||
yyjson_mut_obj_add_strbuf(doc, gpuObj, "driver", &vulkanGpu->driver);
|
||||
@@ -100,28 +89,32 @@ bool ffGenerateVulkanJsonResult(FF_MAYBE_UNUSED FFVulkanOptions* options, yyjson
|
||||
|
||||
{
|
||||
yyjson_mut_val* dedicatedMemory = yyjson_mut_obj_add_obj(doc, memoryObj, "dedicated");
|
||||
if (vulkanGpu->dedicated.total != FF_GPU_VMEM_SIZE_UNSET)
|
||||
if (vulkanGpu->dedicated.total != FF_GPU_VMEM_SIZE_UNSET) {
|
||||
yyjson_mut_obj_add_uint(doc, dedicatedMemory, "total", vulkanGpu->dedicated.total);
|
||||
else
|
||||
} else {
|
||||
yyjson_mut_obj_add_null(doc, dedicatedMemory, "total");
|
||||
}
|
||||
|
||||
if (vulkanGpu->dedicated.used != FF_GPU_VMEM_SIZE_UNSET)
|
||||
if (vulkanGpu->dedicated.used != FF_GPU_VMEM_SIZE_UNSET) {
|
||||
yyjson_mut_obj_add_uint(doc, dedicatedMemory, "used", vulkanGpu->dedicated.total);
|
||||
else
|
||||
} else {
|
||||
yyjson_mut_obj_add_null(doc, dedicatedMemory, "used");
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
yyjson_mut_val* sharedMemory = yyjson_mut_obj_add_obj(doc, memoryObj, "shared");
|
||||
if (vulkanGpu->shared.total != FF_GPU_VMEM_SIZE_UNSET)
|
||||
if (vulkanGpu->shared.total != FF_GPU_VMEM_SIZE_UNSET) {
|
||||
yyjson_mut_obj_add_uint(doc, sharedMemory, "total", vulkanGpu->shared.total);
|
||||
else
|
||||
} else {
|
||||
yyjson_mut_obj_add_null(doc, sharedMemory, "total");
|
||||
}
|
||||
|
||||
if (vulkanGpu->shared.used != FF_GPU_VMEM_SIZE_UNSET)
|
||||
if (vulkanGpu->shared.used != FF_GPU_VMEM_SIZE_UNSET) {
|
||||
yyjson_mut_obj_add_uint(doc, sharedMemory, "used", vulkanGpu->shared.used);
|
||||
else
|
||||
} else {
|
||||
yyjson_mut_obj_add_null(doc, sharedMemory, "used");
|
||||
}
|
||||
}
|
||||
|
||||
yyjson_mut_obj_add_uint(doc, gpuObj, "deviceId", vulkanGpu->deviceId);
|
||||
@@ -130,13 +123,11 @@ bool ffGenerateVulkanJsonResult(FF_MAYBE_UNUSED FFVulkanOptions* options, yyjson
|
||||
return true;
|
||||
}
|
||||
|
||||
void ffInitVulkanOptions(FFVulkanOptions* options)
|
||||
{
|
||||
void ffInitVulkanOptions(FFVulkanOptions* options) {
|
||||
ffOptionInitModuleArg(&options->moduleArgs, "");
|
||||
}
|
||||
|
||||
void ffDestroyVulkanOptions(FFVulkanOptions* options)
|
||||
{
|
||||
void ffDestroyVulkanOptions(FFVulkanOptions* options) {
|
||||
ffOptionDestroyModuleArg(&options->moduleArgs);
|
||||
}
|
||||
|
||||
@@ -154,5 +145,4 @@ FFModuleBaseInfo ffVulkanModuleInfo = {
|
||||
{"API version", "api-version"},
|
||||
{"Conformance version", "conformance-version"},
|
||||
{"Instance version", "instance-version"},
|
||||
}))
|
||||
};
|
||||
}))};
|
||||
|
||||
Reference in New Issue
Block a user