v133: eliminate version from extension properties

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index b063eece34287f76b9eebd3cad6114e9d9f17693..44882206152a49d31ad94e084719e9b5e89697a7 100644 (file)
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -825,7 +825,7 @@ static void app_dump_extensions(
     printf("\tcount = %d\n", extension_count);
     for (i=0; i< extension_count; i++) {
         uint32_t major, minor, patch;
-        char spec_version[64], extension_version[64];
+        char spec_version[64];
         VkExtensionProperties const *ext_prop = &extension_properties[i];
 
         if (i>0)
@@ -834,10 +834,8 @@ static void app_dump_extensions(
         printf("%s\t", indent);
         extract_version(ext_prop->specVersion, &major, &minor, &patch);
         snprintf(spec_version, sizeof(spec_version), "%d.%d.%d", major, minor, patch);
-        extract_version(ext_prop->version, &major, &minor, &patch);
-        snprintf(extension_version, sizeof(extension_version), "%d.%d.%d", major, minor, patch);
-        printf("%s: Vulkan version %s, extension version %s",
-                       ext_prop->extName, spec_version, extension_version);
+        printf("%s: extension version %s",
+                       ext_prop->extName, spec_version);
     }
     printf("\n");
     fflush(stdout);

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index bf1c64bf6d4b2c2b13eeed2cc9bcb68e551ddf9d..0e42c8a1a3f7907ff5b0550c5c746881e64108a4 100644 (file)
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -45,8 +45,7 @@ static const char * const nulldrv_gpu_exts[NULLDRV_EXT_COUNT] = {
 static const VkExtensionProperties intel_gpu_exts[NULLDRV_EXT_COUNT] = {
     {
         .extName = VK_WSI_LUNARG_EXTENSION_NAME,
-        .version = VK_WSI_LUNARG_REVISION,
-        .specVersion = VK_API_VERSION,
+        .specVersion = ,VK_WSI_LUNARG_REVISION,
     }
 };
 

diff --git a/layers/basic.cpp b/layers/basic.cpp
index bc2d1fc501f6afdd0660faba3a57511ef2179145..300a6bbfb8dd88a53112731b0bae2ab6263f669b 100644 (file)
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -74,7 +74,6 @@ static const VkExtensionProperties basic_physicaldevice_extensions[] = {
     {
         "vkLayerExtension1",
         VK_MAKE_VERSION(0, 1, 0),
-        VK_API_VERSION
     }
 };
 

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index b65bef77bd781b55c261a1ef559577920a407e07..5ec2346791c01fc8097f01cfb2e1965f336aa537 100644 (file)
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1431,7 +1431,6 @@ static const VkExtensionProperties ds_device_extensions[] = {
     {
         DEBUG_MARKER_EXTENSION_NAME,
         VK_MAKE_VERSION(0, 1, 0),
-        VK_API_VERSION
     }
 };
 
@@ -2701,7 +2700,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelin
         if (pCB->state == CB_UPDATE_ACTIVE) {
             updateCBTracking(cmdBuffer);
             addCmd(pCB, CMD_PIPELINEBARRIER);
-            get_dispatch_table(draw_state_device_table_map, cmdBuffer)->CmdPipelineBarrier(cmdBuffer, sourceStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers);
+            get_dispatch_table(draw_state_device_table_map, cmdBuffer)->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers);
         } else {
             report_error_no_cb_begin(cmdBuffer, "vkCmdPipelineBarrier()");
         }

diff --git a/loader/debug_report.c b/loader/debug_report.c
index 4d6314a9bb33e6ba53032f11fdaccdb07e2b6c45..cc0293a25f239c2be5967ebdac13a14e25c74d14 100644 (file)
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -42,8 +42,7 @@ typedef void (VKAPI *PFN_stringCallback)(char *message);
 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,
 };

diff --git a/loader/loader.c b/loader/loader.c
index 12e2fe0fe6a82d75f9fa4894a683c850d2362b43..9e530e7ff97adb19bb43f83dfc584f7a4ec41b87 100644 (file)
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -329,20 +329,16 @@ static void loader_add_global_extensions(
         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 @@ static void loader_add_physical_device_extensions(
 
             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 @@ static void loader_add_physical_device_extensions(
                          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 @@ static void loader_add_layer_properties(struct loader_layer_list *layer_list,
     //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) {