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/image_tests.cpp

diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index d0af54c..a290bd0 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -78,6 +78,7 @@
     XGL_APPLICATION_INFO app_info;
     XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
     uint32_t gpu_count;
+    XGL_INSTANCE inst;
     XGL_IMAGE m_image;
     XGL_GPU_MEMORY *m_image_mem;
     uint32_t m_num_mem;
@@ -93,8 +94,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, &this->inst);
+        ASSERT_XGL_SUCCESS(err);
+        err = xglEnumerateGpus(this->inst, XGL_MAX_PHYSICAL_GPUS,
+                               &this->gpu_count, objs);
         ASSERT_XGL_SUCCESS(err);
         ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
@@ -103,7 +106,7 @@
     }
 
     virtual void TearDown() {
-        xglInitAndEnumerateGpus(&this->app_info, NULL, 0, &gpu_count, NULL);
+        xglDestroyInstance(this->inst);
     }
 };