зеркало из https://github.com/AvaloniaUI/angle.git
Simplify ANGLE test config names.
We don't need to use upper case. Lower case can be more readable. Skip a test on Linux/NV/Vulkan that became flaky after changing the test order. Bug: angleproject:3393 Change-Id: Ie027e08ddc9d47b9484cf5b1aaca72a05dd60517 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1574676 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
This commit is contained in:
Родитель
e421c05c6b
Коммит
69f72b4183
|
@ -842,6 +842,9 @@ TEST_P(RobustResourceInitTest, ReadingOutOfBoundsCopiedTexture)
|
||||||
{
|
{
|
||||||
ANGLE_SKIP_TEST_IF(!hasGLExtension());
|
ANGLE_SKIP_TEST_IF(!hasGLExtension());
|
||||||
|
|
||||||
|
// Flaky failure on Linux / NV / Vulkan when run in a sequence. http://anglebug.com/3416
|
||||||
|
ANGLE_SKIP_TEST_IF(IsVulkan() && IsNVIDIA() && IsLinux());
|
||||||
|
|
||||||
GLTexture tex;
|
GLTexture tex;
|
||||||
setupTexture(&tex);
|
setupTexture(&tex);
|
||||||
GLFramebuffer fbo;
|
GLFramebuffer fbo;
|
||||||
|
|
|
@ -74,7 +74,7 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
|
||||||
switch (pp.eglParameters.renderer)
|
switch (pp.eglParameters.renderer)
|
||||||
{
|
{
|
||||||
case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
|
case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
|
||||||
stream << "DEFAULT";
|
stream << "Default";
|
||||||
break;
|
break;
|
||||||
case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE:
|
case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE:
|
||||||
stream << "D3D9";
|
stream << "D3D9";
|
||||||
|
@ -83,19 +83,19 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
|
||||||
stream << "D3D11";
|
stream << "D3D11";
|
||||||
break;
|
break;
|
||||||
case EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE:
|
case EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE:
|
||||||
stream << "NULL";
|
stream << "Null";
|
||||||
break;
|
break;
|
||||||
case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
|
case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
|
||||||
stream << "OPENGL";
|
stream << "OpenGL";
|
||||||
break;
|
break;
|
||||||
case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
|
case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
|
||||||
stream << "OPENGLES";
|
stream << "OpenGLES";
|
||||||
break;
|
break;
|
||||||
case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
|
case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
|
||||||
stream << "VULKAN";
|
stream << "Vulkan";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
stream << "UNDEFINED";
|
stream << "Undefined";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -107,7 +107,7 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
|
||||||
stream << "GLES";
|
stream << "GLES";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
stream << "ERROR";
|
stream << "Error";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -129,30 +129,30 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE:
|
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE:
|
||||||
stream << "_NULL";
|
stream << "_Null";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
|
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
|
||||||
stream << "_REFERENCE";
|
stream << "_Reference";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE:
|
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE:
|
||||||
stream << "_WARP";
|
stream << "_Warp";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
stream << "_ERR";
|
stream << "_Error";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (pp.eglParameters.presentPath)
|
switch (pp.eglParameters.presentPath)
|
||||||
{
|
{
|
||||||
case EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE:
|
case EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE:
|
||||||
stream << "_PRESENT_PATH_COPY";
|
stream << "_PresentPathCopy";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE:
|
case EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE:
|
||||||
stream << "_PRESENT_PATH_FAST";
|
stream << "_PresentPathFast";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EGL_DONT_CARE:
|
case EGL_DONT_CARE:
|
||||||
|
@ -160,13 +160,13 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
stream << "_ERR";
|
stream << "_Error";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pp.eglParameters.contextVirtualization == EGL_FALSE)
|
if (pp.eglParameters.contextVirtualization == EGL_FALSE)
|
||||||
{
|
{
|
||||||
stream << "_NO_VIRTUAL";
|
stream << "_NoVirtual";
|
||||||
}
|
}
|
||||||
|
|
||||||
return stream;
|
return stream;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче