fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 00:37:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: replaces NULL to nullptr

Browse Source
This commit is contained in:
李通洲
2026-07-10 18:08:04 +08:00
parent 873454191f
commit ba18705d2e
387 changed files with 2411 additions and 2411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/vulkan/vulkan.c
+14 -14
View File
@@ -29,7 +29,7 @@ static void applyDriverName(VkPhysicalDeviceDriverPropertiesKHR* properties, FFs
* Some drivers (android for example) expose a multiline string as driver info.
* It contains too much info anyways, so we just don't append it.
*/
if (!ffStrSet(properties->driverInfo) || strchr(properties->driverInfo, '\n') != NULL) {
if (!ffStrSet(properties->driverInfo) || strchr(properties->driverInfo, '\n') != nullptr) {
return;
}
@@ -67,8 +67,8 @@ static const char* detectVulkan(FFVulkanResult* result) {
// We need to get the function pointer this way, because it is only provided by vulkan 1.1 and higher.
// a dlsym would fail on 1.0 implementations
PFN_vkEnumerateInstanceVersion ffvkEnumerateInstanceVersion = (PFN_vkEnumerateInstanceVersion) ffvkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion");
if (ffvkEnumerateInstanceVersion != NULL) {
PFN_vkEnumerateInstanceVersion ffvkEnumerateInstanceVersion = (PFN_vkEnumerateInstanceVersion) ffvkGetInstanceProcAddr(nullptr, "vkEnumerateInstanceVersion");
if (ffvkEnumerateInstanceVersion != nullptr) {
uint32_t version;
if (ffvkEnumerateInstanceVersion(&version) == VK_SUCCESS) {
applyVulkanVersion(version, &instanceVersion);
@@ -89,10 +89,10 @@ static const char* detectVulkan(FFVulkanResult* result) {
FF_DEBUG("Creating Vulkan instance with requested API version %s", instanceVersion.minor >= 1 ? "1.1" : "1.0");
VkResult res = ffvkCreateInstance(&(VkInstanceCreateInfo) {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
.pNext = NULL,
.pNext = nullptr,
.pApplicationInfo = &(VkApplicationInfo) {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pNext = NULL,
.pNext = nullptr,
.pApplicationName = FASTFETCH_PROJECT_NAME,
.applicationVersion = projectVersion,
.pEngineName = "vulkanPrintGPUs",
@@ -101,11 +101,11 @@ static const char* detectVulkan(FFVulkanResult* result) {
// We need to request 1.1 to get physicalDeviceDriverProperties
.apiVersion = instanceVersion.minor >= 1 ? VK_API_VERSION_1_1 : VK_API_VERSION_1_0 },
.enabledLayerCount = 0,
.ppEnabledLayerNames = NULL,
.ppEnabledLayerNames = nullptr,
.enabledExtensionCount = 0,
.ppEnabledExtensionNames = NULL,
.ppEnabledExtensionNames = nullptr,
.flags = 0 },
NULL,
nullptr,
&vkInstance);
if (res != VK_SUCCESS) {
FF_DEBUG("ffvkCreateInstance() failed with VkResult=%d", res);
@@ -140,7 +140,7 @@ static const char* detectVulkan(FFVulkanResult* result) {
res = ffvkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, physicalDevices);
if (res != VK_SUCCESS) {
FF_DEBUG("ffvkEnumeratePhysicalDevices() failed with VkResult=%d", res);
ffvkDestroyInstance(vkInstance, NULL);
ffvkDestroyInstance(vkInstance, nullptr);
switch (res) {
case VK_ERROR_OUT_OF_HOST_MEMORY:
return "ffvkEnumeratePhysicalDevices() failed: VK_ERROR_OUT_OF_HOST_MEMORY";
@@ -156,7 +156,7 @@ static const char* detectVulkan(FFVulkanResult* result) {
}
FF_DEBUG("Enumerated %u Vulkan physical device(s)", physicalDeviceCount);
PFN_vkGetPhysicalDeviceProperties ffvkGetPhysicalDeviceProperties = NULL;
PFN_vkGetPhysicalDeviceProperties ffvkGetPhysicalDeviceProperties = nullptr;
PFN_vkGetPhysicalDeviceProperties2 ffvkGetPhysicalDeviceProperties2 = (PFN_vkGetPhysicalDeviceProperties2) ffvkGetInstanceProcAddr(vkInstance, "vkGetPhysicalDeviceProperties2"); // 1.1
if (!ffvkGetPhysicalDeviceProperties2) {
ffvkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties) ffvkGetInstanceProcAddr(vkInstance, "vkGetPhysicalDeviceProperties");
@@ -167,7 +167,7 @@ static const char* detectVulkan(FFVulkanResult* result) {
PFN_vkGetPhysicalDeviceMemoryProperties ffvkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties) ffvkGetInstanceProcAddr(vkInstance, "vkGetPhysicalDeviceMemoryProperties");
if (!ffvkGetPhysicalDeviceMemoryProperties) {
FF_DEBUG("vkGetPhysicalDeviceMemoryProperties is unavailable");
ffvkDestroyInstance(vkInstance, NULL);
ffvkDestroyInstance(vkInstance, nullptr);
return "vkGetPhysicalDeviceMemoryProperties is not available";
}
@@ -187,7 +187,7 @@ static const char* detectVulkan(FFVulkanResult* result) {
.pNext = &driverProperties,
};
if (ffvkGetPhysicalDeviceProperties2 != NULL) {
if (ffvkGetPhysicalDeviceProperties2 != nullptr) {
ffvkGetPhysicalDeviceProperties2(physicalDevices[i], &physicalDeviceProperties);
} else {
ffvkGetPhysicalDeviceProperties(physicalDevices[i], &physicalDeviceProperties.properties);
@@ -296,9 +296,9 @@ static const char* detectVulkan(FFVulkanResult* result) {
result->conformanceVersion.chars,
result->gpus.length);
ffvkDestroyInstance(vkInstance, NULL);
ffvkDestroyInstance(vkInstance, nullptr);
FF_DEBUG("Destroyed Vulkan instance");
return NULL;
return nullptr;
}
#endif