Commit 513bc77d by Geoff Lang Committed by Commit Bot

Vulkan: Allow dEQP to create Vulkan displays.

BUG=angleproject:2161 Change-Id: Ia2d4b4edcf9a40621573f124d14147224bbd8431 Reviewed-on: https://chromium-review.googlesource.com/891803 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 13fd988c
......@@ -48,11 +48,9 @@ const char *g_TestExpectationsFiles[] = {
using APIInfo = std::pair<const char *, gpu::GPUTestConfig::API>;
const APIInfo g_eglDisplayAPIs[] = {
{"angle-d3d9", gpu::GPUTestConfig::kAPID3D9},
{"angle-d3d11", gpu::GPUTestConfig::kAPID3D11},
{"angle-gl", gpu::GPUTestConfig::kAPIGLDesktop},
{"angle-gles", gpu::GPUTestConfig::kAPIGLES},
{"angle-null", gpu::GPUTestConfig::kAPIUnknown },
{ "angle-d3d9", gpu::GPUTestConfig::kAPID3D9 },{ "angle-d3d11", gpu::GPUTestConfig::kAPID3D11 },
{ "angle-gl", gpu::GPUTestConfig::kAPIGLDesktop },{ "angle-gles", gpu::GPUTestConfig::kAPIGLES },
{ "angle-null", gpu::GPUTestConfig::kAPIUnknown },{ "angle-vk", gpu::GPUTestConfig::kAPIVulkan },
};
const char *g_deqpEGLString = "--deqp-egl-display-type=";
......
......@@ -104,6 +104,19 @@ ANGLEPlatform::ANGLEPlatform()
m_nativeDisplayFactoryRegistry.registerFactory(glFactory);
}
#if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_WIN32) || (DE_OS == DE_OS_UNIX)
{
std::vector<eglw::EGLAttrib> vkAttribs;
vkAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
vkAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE);
vkAttribs.push_back(EGL_NONE);
auto *vkFactory =
new ANGLENativeDisplayFactory("angle-vk", "ANGLE Vulkan Display", vkAttribs, &mEvents);
m_nativeDisplayFactoryRegistry.registerFactory(vkFactory);
}
#endif
{
std::vector<eglw::EGLAttrib> nullAttribs;
nullAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment