clean some warnings

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f00df4055ec7266e3da998c719e17071d417420c..3441bfa4645b61273c8eae58e39760e5645cc746 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
        ADD_DEFINITIONS (-DDEBUG)
        OPTION(ENABLE_VALIDATION "enable vulkan validation layer" ON)
        IF (UNIX)
-               SET(CMAKE_${LANG}_FLAGS "-std=c99 -Wall")
+               SET(CMAKE_${LANG}_FLAGS "-Wall -Wno-extra -Wno-unknown-pragmas")
        ELSEIF (MSVC)
                SET(CMAKE_${LANG}_FLAGS "/W4 /wd4204 /wd4221 /wd4100")
        ENDIF()
@@ -35,7 +35,7 @@ ELSE()
        ENDIF()
 ENDIF()
 
-if (${LANG} EQUAL "C" AND MSVC)  
+if (${LANG} EQUAL "C" AND MSVC)
        SET(CMAKE_C_FLAGS "/TC ${CMAKE_C_FLAGS}")
 endif ()
 

diff --git a/src/vkh_app.c b/src/vkh_app.c
index 2ae576f8072d32da530c6a43e165293a45426417..57556e6a7d6408e5a7d7b52536b20473db7efb06 100644 (file)
--- a/src/vkh_app.c
+++ b/src/vkh_app.c
@@ -26,97 +26,98 @@
 #define ENGINE_VERSION  1
 
 VkBool32 debugUtilsMessengerCallback (
-    VkDebugUtilsMessageSeverityFlagBitsEXT           messageSeverity,
-    VkDebugUtilsMessageTypeFlagsEXT                  messageTypes,
-    const VkDebugUtilsMessengerCallbackDataEXT*      pCallbackData,
-    void*                                            pUserData) {
-
-    switch (messageSeverity) {
-    case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
-        printf (KGRN);
-        break;
-    case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
-        printf (KYEL);
-        break;
-    case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
-        printf (KRED);
-        break;
-    }
-    switch (messageTypes) {
-    case VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT:
-        printf ("GEN: ");
-        break;
-    case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT:
-        printf ("VAL: ");
-        break;
-    case VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT:
-        printf ("PRF: ");
-        break;
-    }
-
-    printf (KNRM);
-    printf ("%s\n", pCallbackData->pMessage);
-
-
-    fflush(stdout);
-    return VK_FALSE;
+       VkDebugUtilsMessageSeverityFlagBitsEXT           messageSeverity,
+       VkDebugUtilsMessageTypeFlagsEXT                  messageTypes,
+       const VkDebugUtilsMessengerCallbackDataEXT*      pCallbackData,
+       void*                                            pUserData) {
+
+       switch (messageSeverity) {
+       case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
+               printf (KYEL);
+               break;
+       case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
+               printf (KRED);
+               break;
+       default:
+       case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
+               printf (KGRN);
+               break;
+       }
+       switch (messageTypes) {
+       case VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT:
+               printf ("GEN: ");
+               break;
+       case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT:
+               printf ("VAL: ");
+               break;
+       case VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT:
+               printf ("PRF: ");
+               break;
+       }
+
+       printf (KNRM);
+       printf ("%s\n", pCallbackData->pMessage);
+
+
+       fflush(stdout);
+       return VK_FALSE;
 }
 
 VkhApp vkh_app_create (const char* app_name, uint32_t enabledLayersCount, const char* enabledLayers[], uint32_t ext_count, const char* extentions[]) {
-    VkhApp app = (VkhApp)malloc(sizeof(vkh_app_t));
-
-    VkApplicationInfo infos = { .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
-                                .pApplicationName = app_name,
-                                .applicationVersion = 1,
-                                .pEngineName = ENGINE_NAME,
-                                .engineVersion = ENGINE_VERSION,
-                                .apiVersion = VK_API_VERSION_1_1};
-
-    VkInstanceCreateInfo inst_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
-                                       .pApplicationInfo = &infos,
-                                       .enabledExtensionCount = ext_count,
-                                       .ppEnabledExtensionNames = extentions,
-                                       .enabledLayerCount = enabledLayersCount,
-                                       .ppEnabledLayerNames = enabledLayers };
-
-    VK_CHECK_RESULT(vkCreateInstance (&inst_info, NULL, &app->inst));
-    app->infos = infos;
-    app->debugMessenger = VK_NULL_HANDLE;
-    return app;
+       VkhApp app = (VkhApp)malloc(sizeof(vkh_app_t));
+
+       VkApplicationInfo infos = { .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
+                                                               .pApplicationName = app_name,
+                                                               .applicationVersion = 1,
+                                                               .pEngineName = ENGINE_NAME,
+                                                               .engineVersion = ENGINE_VERSION,
+                                                               .apiVersion = VK_API_VERSION_1_1};
+
+       VkInstanceCreateInfo inst_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
+                                                                          .pApplicationInfo = &infos,
+                                                                          .enabledExtensionCount = ext_count,
+                                                                          .ppEnabledExtensionNames = extentions,
+                                                                          .enabledLayerCount = enabledLayersCount,
+                                                                          .ppEnabledLayerNames = enabledLayers };
+
+       VK_CHECK_RESULT(vkCreateInstance (&inst_info, NULL, &app->inst));
+       app->infos = infos;
+       app->debugMessenger = VK_NULL_HANDLE;
+       return app;
 }
 
 void vkh_app_destroy (VkhApp app){
-    if (app->debugMessenger != VK_NULL_HANDLE) {
-        PFN_vkDestroyDebugUtilsMessengerEXT  DestroyDebugUtilsMessenger = (PFN_vkDestroyDebugUtilsMessengerEXT)
-                vkGetInstanceProcAddr(app->inst, "vkDestroyDebugUtilsMessengerEXT");
-
-        DestroyDebugUtilsMessenger (app->inst, app->debugMessenger, VK_NULL_HANDLE);
-    }
-    vkDestroyInstance (app->inst, NULL);
-    free (app);
+       if (app->debugMessenger != VK_NULL_HANDLE) {
+               PFN_vkDestroyDebugUtilsMessengerEXT  DestroyDebugUtilsMessenger = (PFN_vkDestroyDebugUtilsMessengerEXT)
+                               vkGetInstanceProcAddr(app->inst, "vkDestroyDebugUtilsMessengerEXT");
+
+               DestroyDebugUtilsMessenger (app->inst, app->debugMessenger, VK_NULL_HANDLE);
+       }
+       vkDestroyInstance (app->inst, NULL);
+       free (app);
 }
 
 VkInstance vkh_app_get_inst (VkhApp app) {
-    return app->inst;
+       return app->inst;
 }
 
 VkhPhyInfo* vkh_app_get_phyinfos (VkhApp app, uint32_t* count, VkSurfaceKHR surface) {
-    VK_CHECK_RESULT(vkEnumeratePhysicalDevices (app->inst, count, NULL));
-    VkPhysicalDevice* phyDevices = (VkPhysicalDevice*)malloc((*count) * sizeof(VkPhysicalDevice));
-    VK_CHECK_RESULT(vkEnumeratePhysicalDevices (app->inst, count, phyDevices));
-    VkhPhyInfo* infos = (VkhPhyInfo*)malloc((*count) * sizeof(VkhPhyInfo));
+       VK_CHECK_RESULT(vkEnumeratePhysicalDevices (app->inst, count, NULL));
+       VkPhysicalDevice* phyDevices = (VkPhysicalDevice*)malloc((*count) * sizeof(VkPhysicalDevice));
+       VK_CHECK_RESULT(vkEnumeratePhysicalDevices (app->inst, count, phyDevices));
+       VkhPhyInfo* infos = (VkhPhyInfo*)malloc((*count) * sizeof(VkhPhyInfo));
 
-    for (uint32_t i=0; i<(*count); i++)
-        infos[i] = vkh_phyinfo_create (phyDevices[i], surface);
+       for (uint32_t i=0; i<(*count); i++)
+               infos[i] = vkh_phyinfo_create (phyDevices[i], surface);
 
-    free (phyDevices);
-    return infos;
+       free (phyDevices);
+       return infos;
 }
 
 void vkh_app_free_phyinfos (uint32_t count, VkhPhyInfo* infos) {
-    for (uint32_t i=0; i<count; i++)
-        vkh_phyinfo_destroy (infos[i]);
-    free (infos);
+       for (uint32_t i=0; i<count; i++)
+               vkh_phyinfo_destroy (infos[i]);
+       free (infos);
 }
 /**
  * @brief Add a Debug utils messenger to this  VkhApp. It will be destroyed on VkhApp end.
@@ -126,43 +127,43 @@ void vkh_app_free_phyinfos (uint32_t count, VkhPhyInfo* infos) {
  * @param optional message callback, if null a default one which print to stdout is configured.
  */
 void vkh_app_enable_debug_messenger (VkhApp app,
-    VkDebugUtilsMessageTypeFlagsEXT typeFlags,
-    VkDebugUtilsMessageSeverityFlagsEXT severityFlags,
-    PFN_vkDebugUtilsMessengerCallbackEXT callback){
-
-    VkDebugUtilsMessengerCreateInfoEXT info = { .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
-                                                .pNext = VK_NULL_HANDLE,
-                                                .flags = 0,
-                                                .messageSeverity = severityFlags,
-                                                .messageType = typeFlags,
-                                                .pUserData = NULL };
-    if (callback == NULL)
-        info.pfnUserCallback = (PFN_vkDebugUtilsMessengerCallbackEXT)debugUtilsMessengerCallback;
-    else
-        info.pfnUserCallback = callback;
-
-    PFN_vkCreateDebugUtilsMessengerEXT  CreateDebugUtilsMessenger = (PFN_vkCreateDebugUtilsMessengerEXT)
-            vkGetInstanceProcAddr(app->inst, "vkCreateDebugUtilsMessengerEXT");
-
-    CreateDebugUtilsMessenger(app->inst, &info, VK_NULL_HANDLE, &app->debugMessenger);
+       VkDebugUtilsMessageTypeFlagsEXT typeFlags,
+       VkDebugUtilsMessageSeverityFlagsEXT severityFlags,
+       PFN_vkDebugUtilsMessengerCallbackEXT callback){
+
+       VkDebugUtilsMessengerCreateInfoEXT info = { .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
+                                                                                               .pNext = VK_NULL_HANDLE,
+                                                                                               .flags = 0,
+                                                                                               .messageSeverity = severityFlags,
+                                                                                               .messageType = typeFlags,
+                                                                                               .pUserData = NULL };
+       if (callback == NULL)
+               info.pfnUserCallback = (PFN_vkDebugUtilsMessengerCallbackEXT)debugUtilsMessengerCallback;
+       else
+               info.pfnUserCallback = callback;
+
+       PFN_vkCreateDebugUtilsMessengerEXT  CreateDebugUtilsMessenger = (PFN_vkCreateDebugUtilsMessengerEXT)
+                       vkGetInstanceProcAddr(app->inst, "vkCreateDebugUtilsMessengerEXT");
+
+       CreateDebugUtilsMessenger(app->inst, &info, VK_NULL_HANDLE, &app->debugMessenger);
 }
 
 /*VkPhysicalDevice vkh_app_select_phy (VkhApp app, VkPhysicalDeviceType preferedPhyType) {
-    if (app->phyCount == 1)
-        return app->phyDevices[0];
+       if (app->phyCount == 1)
+               return app->phyDevices[0];
 
-    for (int i=0; i<app->phyCount; i++){
-        VkPhysicalDeviceProperties phy;
-        vkGetPhysicalDeviceProperties (app->phyDevices[i], &phy);
-        if (phy.deviceType & preferedPhyType){
+       for (int i=0; i<app->phyCount; i++){
+               VkPhysicalDeviceProperties phy;
+               vkGetPhysicalDeviceProperties (app->phyDevices[i], &phy);
+               if (phy.deviceType & preferedPhyType){
 #if DEBUG
-            printf ("GPU: %s  vulkan:%d.%d.%d driver:%d\n", phy.deviceName,
-                    phy.apiVersion>>22, phy.apiVersion>>12&2048, phy.apiVersion&8191,
-                    phy.driverVersion);
+                       printf ("GPU: %s  vulkan:%d.%d.%d driver:%d\n", phy.deviceName,
+                                       phy.apiVersion>>22, phy.apiVersion>>12&2048, phy.apiVersion&8191,
+                                       phy.driverVersion);
 #endif
-            return app->phyDevices[i];
-        }
-    }
-    fprintf (stderr, "No suitable GPU found\n");
-    exit (-1);
+                       return app->phyDevices[i];
+               }
+       }
+       fprintf (stderr, "No suitable GPU found\n");
+       exit (-1);
 }*/