commit 73a21d311a3e905b8874b08ca6a54a2a5931b240
author Courtney Goeltzenleuchter <courtney@LunarG.com> Sun Jul 12 13:20:05 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:20 2015 -0600
tree ea26d7a5069fc9e63aad05d3c6a0ac8093c76a12
parent 82b348f920f7be3cd791979ec3dbacf349e320ca

v133: eliminate version from extension properties

loader/debug_report.c

diff --git a/loader/debug_report.c b/loader/debug_report.c
index 4d6314a..cc0293a 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -42,8 +42,7 @@
 static const struct loader_extension_property debug_report_extension_info = {
     .info =  {
         .extName = DEBUG_REPORT_EXTENSION_NAME,
-        .version = VK_DEBUG_REPORT_EXTENSION_VERSION,
-        .specVersion = VK_API_VERSION,
+        .specVersion = VK_DEBUG_REPORT_EXTENSION_VERSION,
         },
     .origin = VK_EXTENSION_ORIGIN_LOADER,
 };

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index 12e2fe0..9e530e7 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -329,20 +329,16 @@
         ext_props.origin = origin;
         ext_props.lib_name = lib_name;
 
-        char spec_version[64], version[64];
+        char spec_version[64];
 
         snprintf(spec_version, sizeof(spec_version), "%d.%d.%d",
                  VK_MAJOR(ext_props.info.specVersion),
                  VK_MINOR(ext_props.info.specVersion),
                  VK_PATCH(ext_props.info.specVersion));
-        snprintf(version, sizeof(version), "%d.%d.%d",
-                 VK_MAJOR(ext_props.info.version),
-                 VK_MINOR(ext_props.info.version),
-                 VK_PATCH(ext_props.info.version));
 
         loader_log(VK_DBG_REPORT_DEBUG_BIT, 0,
-                   "Global Extension: %s (%s) version %s, Vulkan version %s",
-                   ext_props.info.extName, lib_name, version, spec_version);
+                   "Global Extension: %s (%s) version %s",
+                   ext_props.info.extName, lib_name, spec_version);
         loader_add_to_ext_list(ext_list, 1, &ext_props);
     }
 
@@ -373,7 +369,7 @@
 
             res = get_phys_dev_ext_props(physical_device, NULL, &count, extension_properties);
             for (i = 0; i < count; i++) {
-                char spec_version[64], version[64];
+                char spec_version[64];
 
                 memcpy(&ext_props.info, &extension_properties[i], sizeof(VkExtensionProperties));
 
@@ -381,14 +377,10 @@
                          VK_MAJOR(ext_props.info.specVersion),
                          VK_MINOR(ext_props.info.specVersion),
                          VK_PATCH(ext_props.info.specVersion));
-                snprintf(version, sizeof(version), "%d.%d.%d",
-                         VK_MAJOR(ext_props.info.version),
-                         VK_MINOR(ext_props.info.version),
-                         VK_PATCH(ext_props.info.version));
 
                 loader_log(VK_DBG_REPORT_DEBUG_BIT, 0,
-                           "PhysicalDevice Extension: %s (%s) version %s, Vulkan version %s",
-                           ext_props.info.extName, lib_name, version, spec_version);
+                           "PhysicalDevice Extension: %s (%s) version %s",
+                           ext_props.info.extName, lib_name, spec_version);
                 loader_add_to_ext_list(ext_list, 1, &ext_props);
             }
         } else {
@@ -1390,7 +1382,7 @@
     //TODO merge the info with the versions and convert string to int
     props->abi_version = abi_versions;
     props->impl_version = implementation_version;
-    strncpy(props->info.description, description, sizeof(props->info.description));
+    strncpy((char *) props->info.description, description, sizeof(props->info.description));
     props->info.description[sizeof(props->info.description) - 1] = '\0';
     free(description);
     if (is_implicit) {