Use nullptr in place of 0 or NULL

[libs/gui.git] / source / graphics / vkxlib / vulkancontext.cpp

diff --git a/source/graphics/vkxlib/vulkancontext.cpp b/source/graphics/vkxlib/vulkancontext.cpp
index 7026e3007aa738fb3284b418fed75002f43959c6..c3a7d761a1969601e8fe9ddfdf213b5c158de901 100644 (file)
--- a/source/graphics/vkxlib/vulkancontext.cpp
+++ b/source/graphics/vkxlib/vulkancontext.cpp
@@ -96,7 +96,7 @@ void VulkanContext::platform_init(const VulkanOptions &opts)
                instance_create_info.enabledExtensionCount = extensions.size();
                instance_create_info.ppEnabledExtensionNames = extensions.data();
 
-               VkResult result = f.vkCreateInstance(&instance_create_info, 0, &priv->instance);
+               VkResult result = f.vkCreateInstance(&instance_create_info, nullptr, &priv->instance);
                if(result!=VK_SUCCESS)
                        throw vulkan_error(result, "vkCreateInstance");
 
@@ -120,7 +120,7 @@ void VulkanContext::platform_init(const VulkanOptions &opts)
                        debug_report_create_info.pfnCallback = &Private::debug_report_func;
                        debug_report_create_info.pUserData = this;
 
-                       result = f.vkCreateDebugReportCallback(priv->instance, &debug_report_create_info, 0, &priv->debug_report_callback);
+                       result = f.vkCreateDebugReportCallback(priv->instance, &debug_report_create_info, nullptr, &priv->debug_report_callback);
                        if(result!=VK_SUCCESS)
                                throw vulkan_error(result, "vkCreateDebugReportCallback");
                }
@@ -130,12 +130,12 @@ void VulkanContext::platform_init(const VulkanOptions &opts)
                surface_create_info.dpy = display.get_private().display;
                surface_create_info.window = window.get_private().window;
 
-               result = f.vkCreateXlibSurface(priv->instance, &surface_create_info, 0, &priv->surface);
+               result = f.vkCreateXlibSurface(priv->instance, &surface_create_info, nullptr, &priv->surface);
                if(result!=VK_SUCCESS)
                        throw vulkan_error(result, "vkCreateXlibSurface");
 
                unsigned n_phys_devices = 0;
-               result = f.vkEnumeratePhysicalDevices(priv->instance, &n_phys_devices, 0);
+               result = f.vkEnumeratePhysicalDevices(priv->instance, &n_phys_devices, nullptr);
                if(result!=VK_SUCCESS)
                        throw vulkan_error(result, "vkEnumeratePhysicalDevices");
                else if(!n_phys_devices)
@@ -151,7 +151,7 @@ void VulkanContext::platform_init(const VulkanOptions &opts)
                        VkPhysicalDevice phys_device = phys_devices[i];
 
                        unsigned n_queue_families = 0;
-                       f.vkGetPhysicalDeviceQueueFamilyProperties(phys_device, &n_queue_families, 0);
+                       f.vkGetPhysicalDeviceQueueFamilyProperties(phys_device, &n_queue_families, nullptr);
                        vector<VkQueueFamilyProperties> queue_family_props(n_queue_families);
                        f.vkGetPhysicalDeviceQueueFamilyProperties(phys_device, &n_queue_families, queue_family_props.data());
 
@@ -201,7 +201,7 @@ void VulkanContext::platform_init(const VulkanOptions &opts)
                device_create_info.ppEnabledExtensionNames = extensions.data();
                device_create_info.pEnabledFeatures = &features;
 
-               result = f.vkCreateDevice(priv->physical_device, &device_create_info, 0, &priv->device);
+               result = f.vkCreateDevice(priv->physical_device, &device_create_info, nullptr, &priv->device);
                if(result!=VK_SUCCESS)
                        throw vulkan_error(result, "vkCreateDevice");
 
@@ -210,13 +210,13 @@ void VulkanContext::platform_init(const VulkanOptions &opts)
        catch(...)
        {
                if(priv->device)
-                       f.vkDestroyDevice(priv->device, 0);
+                       f.vkDestroyDevice(priv->device, nullptr);
                if(priv->surface)
-                       f.vkDestroySurface(priv->instance, priv->surface, 0);
+                       f.vkDestroySurface(priv->instance, priv->surface, nullptr);
                if(priv->debug_report_callback)
-                       f.vkDestroyDebugReportCallback(priv->instance, priv->debug_report_callback, 0);
+                       f.vkDestroyDebugReportCallback(priv->instance, priv->debug_report_callback, nullptr);
                if(priv->instance)
-                       f.vkDestroyInstance(priv->instance, 0);
+                       f.vkDestroyInstance(priv->instance, nullptr);
                delete priv;
                throw;
        }
@@ -225,11 +225,11 @@ void VulkanContext::platform_init(const VulkanOptions &opts)
 VulkanContext::~VulkanContext()
 {
        const VulkanFunctions &f = priv->functions;
-       f.vkDestroyDevice(priv->device, 0);
-       f.vkDestroySurface(priv->instance, priv->surface, 0);
+       f.vkDestroyDevice(priv->device, nullptr);
+       f.vkDestroySurface(priv->instance, priv->surface, nullptr);
        if(priv->debug_report_callback)
-               f.vkDestroyDebugReportCallback(priv->instance, priv->debug_report_callback, 0);
-       f.vkDestroyInstance(priv->instance, 0);
+               f.vkDestroyDebugReportCallback(priv->instance, priv->debug_report_callback, nullptr);
+       f.vkDestroyInstance(priv->instance, nullptr);
        delete priv;
 }