From 7f4bc2c5a7badb3ddd27b8372fb13e729af919a7 Mon Sep 17 00:00:00 2001
From: Jon Ashburn <jon@lunarg.com>
Date: Tue, 22 Mar 2016 13:57:46 -0600
Subject: tests: Use header macro for API version rather than make_version

Change-Id: I454b5d2c4deea46712dff9d5c2af72af683f05a3
---
 demos/cube.c          | 2 +-
 demos/smoke/Shell.cpp | 2 +-
 demos/tri.c           | 2 +-
 demos/vulkaninfo.c    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/demos/cube.c b/demos/cube.c
index 2c5c55a3..c4bcd2f2 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -2268,7 +2268,7 @@ static void demo_init_vk(struct demo *demo) {
         .applicationVersion = 0,
         .pEngineName = APP_SHORT_NAME,
         .engineVersion = 0,
-        .apiVersion = VK_MAKE_VERSION(1, 0, 0),
+        .apiVersion = VK_API_VERSION_1_0,
     };
     VkInstanceCreateInfo inst_info = {
         .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
diff --git a/demos/smoke/Shell.cpp b/demos/smoke/Shell.cpp
index e3fab496..e774e45e 100644
--- a/demos/smoke/Shell.cpp
+++ b/demos/smoke/Shell.cpp
@@ -185,7 +185,7 @@ void Shell::init_instance()
     app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
     app_info.pApplicationName = settings_.name.c_str();
     app_info.applicationVersion = 0;
-    app_info.apiVersion = VK_MAKE_VERSION(1, 0, 0);
+    app_info.apiVersion = VK_API_VERSION_1_0;
 
     VkInstanceCreateInfo instance_info = {};
     instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
diff --git a/demos/tri.c b/demos/tri.c
index c1a73ed0..c17d668c 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1869,7 +1869,7 @@ static void demo_init_vk(struct demo *demo) {
         .applicationVersion = 0,
         .pEngineName = APP_SHORT_NAME,
         .engineVersion = 0,
-        .apiVersion = VK_MAKE_VERSION(1, 0, 0),
+        .apiVersion = VK_API_VERSION_1_0,
     };
     VkInstanceCreateInfo inst_info = {
         .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index 5505b878..7fb13f57 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -579,7 +579,7 @@ static void app_create_instance(struct app_instance *inst) {
         .applicationVersion = 1,
         .pEngineName = APP_SHORT_NAME,
         .engineVersion = 1,
-        .apiVersion = VK_MAKE_VERSION(1, 0, 0),
+        .apiVersion = VK_API_VERSION_1_0,
     };
     VkInstanceCreateInfo inst_info = {
         .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
-- 
cgit v1.2.3