commit b5d2c942fa3e6dc207a4742177184b2ed88e6bd3
author Tony Barbour <tony@LunarG.com> Tue Jul 14 13:34:05 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:23 2015 -0600
tree e6900ece6f049fe5f06ac476acf5b8d1a7940f46
parent cf48cad66f65c971bdf25cac91a29417fbe85bf1

Clean up warnings from release build

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index f89db4a..f70830e 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1042,6 +1042,7 @@
         uint32_t *count,
         struct loader_extension_list **list)
 {
+    *count = 0;
     if (layer_name == NULL || (strlen(layer_name) == 0)) {
         *count = icd->device_extension_cache[gpu_idx].count;
         *list = &icd->device_extension_cache[gpu_idx];
@@ -1827,6 +1828,7 @@
 struct loader_icd * loader_get_icd(const VkPhysicalDevice gpu, uint32_t *gpu_index)
 {
 
+    *gpu_index = 0;
     for (struct loader_instance *inst = loader.instances; inst; inst = inst->next) {
         for (struct loader_icd *icd = inst->icds; icd; icd = icd->next) {
             for (uint32_t i = 0; i < icd->gpu_count; i++)
@@ -1896,7 +1898,7 @@
         struct loader_layer_properties *layer_prop)
 {
     uint32_t idx;
-    struct loader_lib_info *new_layer_lib_list, *my_lib;
+    struct loader_lib_info *new_layer_lib_list, *my_lib = NULL;
 
     for (uint32_t i = 0; i < loader.loaded_layer_lib_count; i++) {
         if (strcmp(loader.loaded_layer_lib_list[i].lib_name, layer_prop->lib_info.lib_name) == 0) {
@@ -1907,13 +1909,14 @@
         }
     }
 
-    my_lib->ref_count--;
-    if (my_lib->ref_count > 0) {
-        loader_log(VK_DBG_REPORT_DEBUG_BIT, 0,
-                   "Decrement reference count for layer library %s", layer_prop->lib_info.lib_name);
-        return;
+    if (my_lib) {
+        my_lib->ref_count--;
+        if (my_lib->ref_count > 0) {
+            loader_log(VK_DBG_REPORT_DEBUG_BIT, 0,
+                       "Decrement reference count for layer library %s", layer_prop->lib_info.lib_name);
+            return;
+        }
     }
-
     loader_platform_close_library(my_lib->lib_handle);
     loader_log(VK_DBG_REPORT_DEBUG_BIT, 0,
                "Unloading layer library %s", layer_prop->lib_info.lib_name);

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index b5e528c..9d6d991 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1041,7 +1041,7 @@
 
 VkShaderObj::VkShaderObj(VkDeviceObj *device, const char * shader_code, VkShaderStage stage, VkRenderFramework *framework)
 {
-    VkResult err = VK_SUCCESS;
+    VkResult U_ASSERT_ONLY err = VK_SUCCESS;
     std::vector<unsigned int> spv;
     VkShaderCreateInfo createInfo;
     VkShaderModuleCreateInfo moduleCreateInfo;

vk_helper.py

diff --git a/vk_helper.py b/vk_helper.py
index b52129a..bcff445 100755
--- a/vk_helper.py
+++ b/vk_helper.py
@@ -972,8 +972,8 @@
         sh_funcs.append("    return final_str;")
         sh_funcs.append("}")
         sh_funcs.append('%s' % lineinfo.get())
-        # Add function to return a string value for input uint32_t
-        sh_funcs.append("string string_convert_helper(const uint32_t toString, const string prefix)\n{")
+        # Add function to return a string value for input uint64_t
+        sh_funcs.append("string string_convert_helper(const uint64_t toString, const string prefix)\n{")
         sh_funcs.append("    using namespace StreamControl;")
         sh_funcs.append("    stringstream ss;")
         sh_funcs.append('    ss << toString;')