commit 9c877b2147d35477396bd252a7199cead9f43fd8
author Chia-I Wu <olv@lunarg.com> Sun Dec 28 14:37:25 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:02 2015 -0700
tree 9a17e5996ef2fa2c1b9b9d64aa0dd623e585759f
parent 1c9869eeb2a980f42838808922c3b87780179f18

tests: remove dependencies on xglgpu.h

Replace XglGpu by xgl_testing::PhysicalGpu.  Replace MAX_GPUS by
XGL_MAX_PHYSICAL_GPUS.

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 8177c21..1c34eff 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -76,7 +76,7 @@
 
 protected:
     XGL_APPLICATION_INFO app_info;
-    XGL_PHYSICAL_GPU objs[MAX_GPUS];
+    XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
     XGL_UINT gpu_count;
     XglDevice *m_device;
 
@@ -92,7 +92,7 @@
         this->app_info.apiVersion = XGL_MAKE_VERSION(0, 22, 0);
 
         err = xglInitAndEnumerateGpus(&app_info, NULL,
-                                      MAX_GPUS, &this->gpu_count, objs);
+                                      XGL_MAX_PHYSICAL_GPUS, &this->gpu_count, objs);
         ASSERT_XGL_SUCCESS(err);
         ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
@@ -106,10 +106,10 @@
 
 TEST(Initialization, xglInitAndEnumerateGpus) {
     XGL_APPLICATION_INFO app_info = {};
-    XGL_PHYSICAL_GPU objs[MAX_GPUS];
+    XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
     XGL_UINT gpu_count;
     XGL_RESULT err;
-    XglGpu *gpu;
+    xgl_testing::PhysicalGpu *gpu;
     XGL_CHAR *layers[16];
     XGL_SIZE layer_count;
     XGL_CHAR layer_buf[16][256];
@@ -123,7 +123,7 @@
     app_info.apiVersion = XGL_MAKE_VERSION(0, 22, 0);
 
     err = xglInitAndEnumerateGpus(&app_info, NULL,
-                                  MAX_GPUS, &gpu_count, objs);
+                                  XGL_MAX_PHYSICAL_GPUS, &gpu_count, objs);
     ASSERT_XGL_SUCCESS(err);
     ASSERT_GE(gpu_count, 1) << "No GPU available";
 
@@ -137,7 +137,7 @@
     printf("\n");
 
     // TODO: Iterate over all GPUs
-    gpu = new XglGpu(0, objs[0]);
+    gpu = new xgl_testing::PhysicalGpu(objs[0]);
     delete gpu;
 
     // TODO: Verify destroy functions