openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_vulkan-loader synced 2025-03-01 12:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: Convert to using Instancing APIs rather than xglInitAndEnumerateGpus

Browse Source
This commit is contained in:
Jon Ashburn 2015-01-29 15:48:00 -07:00 committed by Courtney Goeltzenleuchter
parent 7afa3c5ba5
commit bb9dfa5f60
5 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/blit_tests.cpp
View File

@ -46,6 +46,7 @@ public:
private:
XGL_APPLICATION_INFO app_;
int default_dev_;
XGL_INSTANCE inst;
std::vector<Device *> devs_;
};
@ -144,7 +145,9 @@ void Environment::SetUp()
uint32_t count;
XGL_RESULT err;
err = xglInitAndEnumerateGpus(&app_, NULL, ARRAY_SIZE(gpus), &count, gpus);
err = xglCreateInstance(&app_, NULL, &inst);
ASSERT_EQ(XGL_SUCCESS, err);
err = xglEnumerateGpus(inst, ARRAY_SIZE(gpus), &count, gpus);
ASSERT_EQ(XGL_SUCCESS, err);
ASSERT_GT(count, default_dev_);
@ -165,8 +168,7 @@ void Environment::TearDown()
delete *it;
devs_.clear();
uint32_t dummy_count;
xglInitAndEnumerateGpus(&app_, NULL, 0, &dummy_count, NULL);
xglDestroyInstance(inst);
}
uint32_t ImageChecker::hash_salt_;

9
tests/image_tests.cpp
View File

@ -78,6 +78,7 @@ protected:
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 @@ protected:
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 @@ protected:
}
virtual void TearDown() {
xglInitAndEnumerateGpus(&this->app_info, NULL, 0, &gpu_count, NULL);
xglDestroyInstance(this->inst);
}
};

19
tests/init.cpp
View File

@ -77,6 +77,7 @@ public:
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 @@ protected:
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 @@ protected:
}
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 @@ TEST(Initialization, xglInitAndEnumerateGpus) {
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 @@ TEST(Initialization, xglInitAndEnumerateGpus) {
delete gpu;
// TODO: Verify destroy functions
err = xglDestroyInstance(inst);
ASSERT_XGL_SUCCESS(err);
}
TEST_F(XglTest, AllocMemory) {

8
tests/xglrenderframework.cpp
View File

@ -52,8 +52,10 @@ void XglRenderFramework::InitFramework()
{
XGL_RESULT err;
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(inst, XGL_MAX_PHYSICAL_GPUS, &this->gpu_count,
objs);
ASSERT_XGL_SUCCESS(err);
ASSERT_GE(this->gpu_count, 1) << "No GPU available";
@ -74,7 +76,7 @@ void XglRenderFramework::ShutdownFramework()
// reset the driver
delete m_device;
xglInitAndEnumerateGpus(&this->app_info, XGL_NULL_HANDLE, 0, &gpu_count, XGL_NULL_HANDLE);
xglDestroyInstance(this->inst);
}
void XglRenderFramework::InitState()

1
tests/xglrenderframework.h
View File

@ -65,6 +65,7 @@ public:
protected:
XGL_APPLICATION_INFO app_info;
XGL_INSTANCE inst;
XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
uint32_t gpu_count;
XglDevice *m_device;