Commit b84cdffe by Eric Binet Committed by Commit Bot

Fix colored indexed point tests not using color in vertex buffer.

In the previous version, the IndexedPointsTestUInt tests named VertexWithColorUnsignedIntOffset* were redundant with UnsignedIntOffset*. Bug: angleproject:3923 Change-Id: I6b9b8f2bd78882bcac7c3b89e798291ee94eea70 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1988998 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent e5d3c659
......@@ -222,7 +222,7 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset0)
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(0, true);
......@@ -232,7 +232,7 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset1)
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(1, true);
......@@ -242,7 +242,7 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset2)
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(2, true);
......@@ -252,7 +252,7 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset3)
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(3, true);
......@@ -292,7 +292,7 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset0)
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(0, true);
......@@ -302,7 +302,7 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset1)
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(1, true);
......@@ -312,7 +312,7 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset2)
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(2, true);
......@@ -322,7 +322,7 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset3)
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(3, true);
......@@ -332,7 +332,7 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffsetChangingIndice
{
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// TODO(fjhenigman): Figure out why this fails on Ozone Intel.
......@@ -398,7 +398,9 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset0)
}
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
runTest(0, false);
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(0, true);
}
TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset1)
......@@ -409,7 +411,9 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset1)
}
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
runTest(1, false);
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(1, true);
}
TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset2)
......@@ -420,7 +424,9 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset2)
}
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
runTest(2, false);
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(2, true);
}
TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset3)
......@@ -431,7 +437,9 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset3)
}
// http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader());
runTest(3, false);
// Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
runTest(3, true);
}
// TODO(lucferron): Diagnose and fix the UByte tests below for Vulkan.
......
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