code clean

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9eada1ce9528b73b7c90998062ab3d25d08caeb1..78bf7173d2569d2d2b6f9a7ebd32628c2dd2043b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
 PROJECT(vkh VERSION 0.1.0 DESCRIPTION "Vulkan helpers library")
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-SET(CMAKE_CXX_FLAGS "-W -Wall")
+SET(CMAKE_CXX_FLAGS "-W -Wall -Wno-extra")
 SET(CMAKE_EXE_LINKER_FLAGS "-lm")
 
 IF(NOT CMAKE_BUILD_TYPE)

diff --git a/src/vkh_phyinfo.c b/src/vkh_phyinfo.c
index 2d5ee5d3d0a49fa2ed67753792e21ecf9d12c78f..299364a79ed1351dfe1243dc8437562185eb4d4d 100644 (file)
--- a/src/vkh_phyinfo.c
+++ b/src/vkh_phyinfo.c
@@ -70,6 +70,7 @@ VkhPhyInfo vkh_phyinfo_create (VkPhysicalDevice phy, VkSurfaceKHR surface) {
             VkBool32 present;
             if (surface)
                 vkGetPhysicalDeviceSurfaceSupportKHR(phy, j, surface, &present);
+            //printf ("surf=%d, q=%d, present=%d\n",surface,j,present);
             if (present){
                 if (pi->pQueue<0)
                     pi->pQueue = j;

diff --git a/src/vkhelpers.c b/src/vkhelpers.c
index b8ae79eec04a1b86e98cd2fffce2ee9dfa039a7b..e3a4f80b2388e71ffb48a0b7e894533f38bbadd9 100644 (file)
--- a/src/vkhelpers.c
+++ b/src/vkhelpers.c
@@ -197,7 +197,7 @@ bool vkh_memory_type_from_properties(VkPhysicalDeviceMemoryProperties* memory_pr
 VkShaderModule vkh_load_module(VkDevice dev, const char* path){
     VkShaderModule module;
     size_t filelength;
-    char* pCode = read_spv(path, &filelength);
+    uint32_t* pCode = (uint32_t*)read_spv(path, &filelength);
     VkShaderModuleCreateInfo createInfo = { .sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,
                                             .pCode = pCode,
                                             .codeSize = filelength };
@@ -208,7 +208,7 @@ VkShaderModule vkh_load_module(VkDevice dev, const char* path){
 }
 
 char *read_spv(const char *filename, size_t *psize) {
-    long int size;
+    size_t size;
     size_t retval;
     void *shader_code;
 
@@ -221,7 +221,7 @@ char *read_spv(const char *filename, size_t *psize) {
         return NULL;
 
     fseek(fp, 0L, SEEK_END);
-    size = ftell(fp);
+    size = (size_t)ftell(fp);
 
     fseek(fp, 0L, SEEK_SET);