All extensions single revision number instead of major.minor.patch

This was decided during the August face-to-face.  Originally, the WSI
extensions did it the normal OpenGL way (single revision number), and the debug
extensions did it the new major.minor.patch way.  When I tried to convert WSI,
an objection was raised.  We decided to go with the OpenGL way.

This commit also changes vulkaninfo to report the single revision number.

This commit also changes the extension "number" assigned to the 2 debug
extensions, basd on a "registration" email that Ian Elliott sent to Jon Leech
on 21 August, 2015.  The initial set of "registered" extensions are (with their
numbers):

1.VK_EXT_KHR_swapchain
2.VK_EXT_KHR_device_swapchain
3.VK_EXT_KHR_display
4.VK_EXT_KHR_display_swapchain
5.VK_EXT_LUNARG_debug_report
6.VK_EXT_LUNARG_debug_marker

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index 0d6aaf27dcf9af7ceba76eb4893519bdc76de157..f96c86e91137610e646248587ecdc47485921aac 100644 (file)
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -980,18 +980,14 @@ 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];
         VkExtensionProperties const *ext_prop = &extension_properties[i];
 
         if (i>0)
             printf("\n"); // separator between 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);
-        printf("%s: extension version %s",
-                       ext_prop->extName, spec_version);
+        printf("%-32s: extension revision %2d",
+                       ext_prop->extName, ext_prop->specVersion);
     }
     printf("\n");
     fflush(stdout);

diff --git a/include/vk_debug_marker_lunarg.h b/include/vk_debug_marker_lunarg.h
index 526778f5e7b74f9819525d19074c418a1b412576..c4579597fd2a9556251899203dcf1a0bbac10a68 100644 (file)
--- a/include/vk_debug_marker_lunarg.h
+++ b/include/vk_debug_marker_lunarg.h
@@ -34,8 +34,8 @@
 #include "vulkan.h"
 #include "vk_debug_report_lunarg.h"
 
-#define VK_DEBUG_MARKER_EXTENSION_NUMBER 3
-#define VK_DEBUG_MARKER_EXTENSION_VERSION VK_MAKE_VERSION(0, 1, 0)
+#define VK_DEBUG_MARKER_EXTENSION_NUMBER 6
+#define VK_DEBUG_MARKER_EXTENSION_REVISION 1
 #ifdef __cplusplus
 extern "C"
 {

diff --git a/include/vk_debug_report_lunarg.h b/include/vk_debug_report_lunarg.h
index eeb842512e49c075ca38f2f43a126ed4dc739a18..7131ae3b892b9ead8243ed951bc753d75ccb881c 100644 (file)
--- a/include/vk_debug_report_lunarg.h
+++ b/include/vk_debug_report_lunarg.h
@@ -34,8 +34,8 @@
 
 #include "vulkan.h"
 
-#define VK_DEBUG_REPORT_EXTENSION_NUMBER 2
-#define VK_DEBUG_REPORT_EXTENSION_VERSION VK_MAKE_VERSION(0, 1, 0)
+#define VK_DEBUG_REPORT_EXTENSION_NUMBER 5
+#define VK_DEBUG_REPORT_EXTENSION_REVISION 1
 #ifdef __cplusplus
 extern "C"
 {

diff --git a/loader/debug_report.c b/loader/debug_report.c
index 2cb7bc3586fe318cd26633c8482a53131c3ace1e..c860b86c3d25c7336e54671dc5c025f8469ae16a 100644 (file)
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -43,7 +43,7 @@ typedef void (VKAPI *PFN_stringCallback)(char *message);
 
 static const VkExtensionProperties debug_report_extension_info = {
         .extName = VK_DEBUG_REPORT_EXTENSION_NAME,
-        .specVersion = VK_DEBUG_REPORT_EXTENSION_VERSION,
+        .specVersion = VK_DEBUG_REPORT_EXTENSION_REVISION,
 };
 
 void debug_report_add_instance_extensions(