commit af11d929e0794b81f91fd65b56c0279ccd0fea1d
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 b9be4d300e5f7afdd24fe9d3e90ce99139302162
parent b76e0fa4883572b972f091a4bb6024a50a2e81b8

tests: remove dependencies on xglgpu.h

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

tests/image_tests.cpp

diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 3274be0..e5673d0 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -76,7 +76,7 @@
 protected:
     XglDevice *m_device;
     XGL_APPLICATION_INFO app_info;
-    XGL_PHYSICAL_GPU objs[MAX_GPUS];
+    XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
     XGL_UINT gpu_count;
     XGL_IMAGE m_image;
     XGL_GPU_MEMORY m_image_mem;
@@ -93,7 +93,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";
 

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

tests/test_common.h

diff --git a/tests/test_common.h b/tests/test_common.h
index d4ff359..52082a6 100644
--- a/tests/test_common.h
+++ b/tests/test_common.h
@@ -11,6 +11,7 @@
 
 #include "gtest/gtest.h"
 #include "gtest-1.7.0/include/gtest/gtest.h"
+#include "xgltestbinding.h"
 
 #define ASSERT_XGL_SUCCESS(err) ASSERT_EQ(XGL_SUCCESS, err) << xgl_result_string(err)
 

tests/xgldevice.h

diff --git a/tests/xgldevice.h b/tests/xgldevice.h
index e2dbc6b..0b9b3a8 100644
--- a/tests/xgldevice.h
+++ b/tests/xgldevice.h
@@ -1,8 +1,7 @@
 #ifndef XGLDEVICE_H
 #define XGLDEVICE_H
 
-#include "xgltestbinding.h"
-#include "xglgpu.h"
+#include "test_common.h"
 
 class XglImage;
 

tests/xglrenderframework.cpp

diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index cfe8a1c..8d0a303 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -56,7 +56,7 @@
     XGL_RESULT err;
 
     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";
 

tests/xglrenderframework.h

diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index 84ffe5a..c9fb54d 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -51,7 +51,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;
     XGL_CMD_BUFFER                  m_cmdBuffer;
@@ -84,7 +84,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";