commit 670b176d8e23e2bb7df43900346bf66336747c27
author Jon Ashburn <jon@lunarg.com> Thu Jan 29 15:48:00 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:10 2015 -0700
tree b6fc390c55763c65b999fb6d7d91c54b446b8d1d
parent 92e8013b79dfd425228aa51fa5c8d78c785aade6

tests: Convert to using Instancing APIs rather than xglInitAndEnumerateGpus

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 78fcefa..f1524c3 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -77,6 +77,7 @@
 
 protected:
     XGL_APPLICATION_INFO app_info;
+    XGL_INSTANCE inst;
     XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
     uint32_t gpu_count;
 
@@ -96,8 +97,10 @@
         this->app_info.engineVersion = 1;
         this->app_info.apiVersion = XGL_MAKE_VERSION(0, 22, 0);
 
-        err = xglInitAndEnumerateGpus(&app_info, NULL,
-                                      XGL_MAX_PHYSICAL_GPUS, &this->gpu_count, objs);
+        err = xglCreateInstance(&app_info, NULL, &inst);
+        ASSERT_XGL_SUCCESS(err);
+        err = xglEnumerateGpus(inst, XGL_MAX_PHYSICAL_GPUS, &this->gpu_count,
+                               objs);
         ASSERT_XGL_SUCCESS(err);
         ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
@@ -111,12 +114,13 @@
     }
 
     virtual void TearDown() {
-        xglInitAndEnumerateGpus(&this->app_info, NULL, 0, &gpu_count, NULL);
+        xglDestroyInstance(inst);
     }
 };
 
-TEST(Initialization, xglInitAndEnumerateGpus) {
+TEST(Initialization, xglEnumerateGpus) {
     XGL_APPLICATION_INFO app_info = {};
+    XGL_INSTANCE inst;
     XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
     uint32_t gpu_count;
     XGL_RESULT err;
@@ -133,8 +137,9 @@
     app_info.engineVersion = 1;
     app_info.apiVersion = XGL_MAKE_VERSION(0, 22, 0);
 
-    err = xglInitAndEnumerateGpus(&app_info, NULL,
-                                  XGL_MAX_PHYSICAL_GPUS, &gpu_count, objs);
+    err = xglCreateInstance(&app_info, NULL, &inst);
+    ASSERT_XGL_SUCCESS(err);
+    err = xglEnumerateGpus(inst, XGL_MAX_PHYSICAL_GPUS, &gpu_count, objs);
     ASSERT_XGL_SUCCESS(err);
     ASSERT_GE(gpu_count, 1) << "No GPU available";
 
@@ -152,6 +157,8 @@
     delete gpu;
 
     // TODO: Verify destroy functions
+    err = xglDestroyInstance(inst);
+    ASSERT_XGL_SUCCESS(err);
 }
 
 TEST_F(XglTest, AllocMemory) {