commit b317fad7ae1ebfa3535e4d5184e7e54503d4afcd
author Jon Ashburn <jon@lunarg.com> Sat Apr 04 14:52:07 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:33:29 2015 +0800
tree d031a738de08b5f21ff44c0a427b7f556604c595
parent 5f3960ef04e8625dfc3e2ef157fae7e79a52f995

misc: Add create_info struct to CreateInstance()

Allows extnesion or layer enablement at CreateInstance
Khronos Bug 13637

tests/image_tests.cpp

diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 1a5fcfd..c4cc58e 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -93,8 +93,14 @@
         this->app_info.pEngineName = "unittest";
         this->app_info.engineVersion = 1;
         this->app_info.apiVersion = XGL_API_VERSION;
-
-        err = xglCreateInstance(&app_info, NULL, &this->inst);
+        XGL_INSTANCE_CREATE_INFO inst_info = {};
+        inst_info.sType = XGL_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+        inst_info.pNext = NULL;
+        inst_info.pAppInfo = &app_info;
+        inst_info.pAllocCb = NULL;
+        inst_info.extensionCount = 0;
+        inst_info.ppEnabledExtensionNames = NULL;
+        err = xglCreateInstance(&inst_info, &this->inst);
         ASSERT_XGL_SUCCESS(err);
         err = xglEnumerateGpus(this->inst, XGL_MAX_PHYSICAL_GPUS,
                                &this->gpu_count, objs);

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 8d07ae1..72779af 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -98,8 +98,14 @@
         this->app_info.pEngineName = "unittest";
         this->app_info.engineVersion = 1;
         this->app_info.apiVersion = XGL_API_VERSION;
-
-        err = xglCreateInstance(&app_info, NULL, &inst);
+        XGL_INSTANCE_CREATE_INFO inst_info = {};
+        inst_info.sType = XGL_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+        inst_info.pNext = NULL;
+        inst_info.pAppInfo = &app_info;
+        inst_info.pAllocCb = NULL;
+        inst_info.extensionCount = 0;
+        inst_info.ppEnabledExtensionNames = NULL;
+        err = xglCreateInstance(&inst_info, &inst);
         ASSERT_XGL_SUCCESS(err);
         err = xglEnumerateGpus(inst, XGL_MAX_PHYSICAL_GPUS, &this->gpu_count,
                                objs);
@@ -137,7 +143,13 @@
     char *layers[16];
     size_t layer_count;
     char layer_buf[16][256];
-
+    XGL_INSTANCE_CREATE_INFO inst_info = {};
+    inst_info.sType = XGL_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+    inst_info.pNext = NULL;
+    inst_info.pAppInfo = &app_info;
+    inst_info.pAllocCb = NULL;
+    inst_info.extensionCount = 0;
+    inst_info.ppEnabledExtensionNames = NULL;
     app_info.sType = XGL_STRUCTURE_TYPE_APPLICATION_INFO;
     app_info.pNext = NULL;
     app_info.pAppName = "base";
@@ -146,7 +158,7 @@
     app_info.engineVersion = 1;
     app_info.apiVersion = XGL_API_VERSION;
 
-    err = xglCreateInstance(&app_info, NULL, &inst);
+    err = xglCreateInstance(&inst_info, &inst);
     ASSERT_XGL_SUCCESS(err);
     err = xglEnumerateGpus(inst, XGL_MAX_PHYSICAL_GPUS, &gpu_count, objs);
     ASSERT_XGL_SUCCESS(err);

tests/test_environment.cpp

diff --git a/tests/test_environment.cpp b/tests/test_environment.cpp
index b73ae2d..812a050 100644
--- a/tests/test_environment.cpp
+++ b/tests/test_environment.cpp
@@ -51,8 +51,14 @@
 
     uint32_t count;
     XGL_RESULT err;
-
-    err = xglCreateInstance(&app_, NULL, &inst);
+    XGL_INSTANCE_CREATE_INFO inst_info = {};
+    inst_info.sType = XGL_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+    inst_info.pNext = NULL;
+    inst_info.pAppInfo = &app_;
+    inst_info.pAllocCb = NULL;
+    inst_info.extensionCount = 0;
+    inst_info.ppEnabledExtensionNames = NULL;
+    err = xglCreateInstance(&inst_info, &inst);
     ASSERT_EQ(XGL_SUCCESS, err);
     err = xglEnumerateGpus(inst, ARRAY_SIZE(gpus), &count, gpus);
     ASSERT_EQ(XGL_SUCCESS, err);
@@ -76,8 +82,15 @@
     const xcb_setup_t *setup;
     xcb_screen_iterator_t iter;
     int scr;
+    XGL_INSTANCE_CREATE_INFO instInfo = {};
+    instInfo.sType = XGL_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+    instInfo.pNext = NULL;
+    instInfo.pAppInfo = &app_;
+    instInfo.pAllocCb = NULL;
+    instInfo.extensionCount = 0;
+    instInfo.ppEnabledExtensionNames = NULL;
 
-    err = xglCreateInstance(&app_, NULL, &inst);
+    err = xglCreateInstance(&instInfo, &inst);
     ASSERT_EQ(XGL_SUCCESS, err);
     err = xglEnumerateGpus(inst, ARRAY_SIZE(gpus), &count, gpus);
     ASSERT_EQ(XGL_SUCCESS, err);

tests/xglrenderframework.cpp

diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index b88a3ed..620b229 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -57,8 +57,14 @@
 void XglRenderFramework::InitFramework()
 {
     XGL_RESULT err;
-
-    err = xglCreateInstance(&app_info, NULL, &this->inst);
+    XGL_INSTANCE_CREATE_INFO instInfo = {};
+    instInfo.sType = XGL_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+    instInfo.pNext = NULL;
+    instInfo.pAppInfo = &app_info;
+    instInfo.pAllocCb = NULL;
+    instInfo.extensionCount = 0;
+    instInfo.ppEnabledExtensionNames = NULL;
+    err = xglCreateInstance(&instInfo, &this->inst);
     ASSERT_XGL_SUCCESS(err);
     err = xglEnumerateGpus(inst, XGL_MAX_PHYSICAL_GPUS, &this->gpu_count,
                            objs);