Skip to content

A
angle
Commit f39b4f02 by Tim Van Patten Committed by Commit Bot
Options

Vulkan Android: Remove workaround to clamp the point size

This is to remove the workaround introduced by anglebug.com/2599 since Nexus 5x devices aren't in the farm anymore and the tests pass on Pixel devices. Bug: angleproject:2599 Test: angle_deqp_gles2_tests Test: angle_end2end_tests Change-Id: I14f724494909486a2164ddd734a95b6980429f29 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1559202 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent d3c57452
Showing with 0 additions and 61 deletions
src/libANGLE/renderer/vulkan/RendererVk.cpp
...@@ -1222,13 +1222,6 @@ void RendererVk::initFeatures(const ExtensionNameList &deviceExtensionNames) ...@@ -1222,13 +1222,6 @@ void RendererVk::initFeatures(const ExtensionNameList &deviceExtensionNames)
mFeatures.clampPointSize = true; mFeatures.clampPointSize = true;
} }
// We also need to clamp point size on several Android drivers.
// TODO(jmadill): Remove suppression once fixed. http://anglebug.com/2599
if (IsAndroid())
{
mFeatures.clampPointSize = true;
}
#if defined(ANGLE_PLATFORM_ANDROID) #if defined(ANGLE_PLATFORM_ANDROID)
// Work around ineffective compute-graphics barriers on Nexus 5X. // Work around ineffective compute-graphics barriers on Nexus 5X.
// TODO(syoussefi): Figure out which other vendors and driver versions are affected. // TODO(syoussefi): Figure out which other vendors and driver versions are affected.
......
src/tests/gl_tests/GLSLTest.cpp
...@@ -4767,9 +4767,6 @@ TEST_P(GLSLTest, PointCoordConsistency) ...@@ -4767,9 +4767,6 @@ TEST_P(GLSLTest, PointCoordConsistency)
// AMD's OpenGL drivers may have the same issue. http://anglebug.com/1643 // AMD's OpenGL drivers may have the same issue. http://anglebug.com/1643
ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsOpenGL()); ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsOpenGL());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
constexpr char kPointCoordVS[] = R"(attribute vec2 position; constexpr char kPointCoordVS[] = R"(attribute vec2 position;
uniform vec2 viewportSize; uniform vec2 viewportSize;
void main() void main()
......
src/tests/gl_tests/IndexedPointsTest.cpp
...@@ -197,33 +197,21 @@ typedef IndexedPointsTest<GLubyte, GL_UNSIGNED_BYTE> IndexedPointsTestUByte; ...@@ -197,33 +197,21 @@ typedef IndexedPointsTest<GLubyte, GL_UNSIGNED_BYTE> IndexedPointsTestUByte;
TEST_P(IndexedPointsTestUByte, UnsignedByteOffset0) TEST_P(IndexedPointsTestUByte, UnsignedByteOffset0)
{ {
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(0); runTest(0);
} }
TEST_P(IndexedPointsTestUByte, UnsignedByteOffset1) TEST_P(IndexedPointsTestUByte, UnsignedByteOffset1)
{ {
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(1); runTest(1);
} }
TEST_P(IndexedPointsTestUByte, UnsignedByteOffset2) TEST_P(IndexedPointsTestUByte, UnsignedByteOffset2)
{ {
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(2); runTest(2);
} }
TEST_P(IndexedPointsTestUByte, UnsignedByteOffset3) TEST_P(IndexedPointsTestUByte, UnsignedByteOffset3)
{ {
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(3); runTest(3);
} }
...@@ -232,9 +220,6 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset0) ...@@ -232,9 +220,6 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset0)
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848 // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(0, true); runTest(0, true);
} }
...@@ -243,9 +228,6 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset1) ...@@ -243,9 +228,6 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset1)
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848 // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(1, true); runTest(1, true);
} }
...@@ -254,9 +236,6 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset2) ...@@ -254,9 +236,6 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset2)
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848 // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(2, true); runTest(2, true);
} }
...@@ -265,9 +244,6 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset3) ...@@ -265,9 +244,6 @@ TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset3)
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848 // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(3, true); runTest(3, true);
} }
...@@ -275,33 +251,21 @@ typedef IndexedPointsTest<GLushort, GL_UNSIGNED_SHORT> IndexedPointsTestUShort; ...@@ -275,33 +251,21 @@ typedef IndexedPointsTest<GLushort, GL_UNSIGNED_SHORT> IndexedPointsTestUShort;
TEST_P(IndexedPointsTestUShort, UnsignedShortOffset0) TEST_P(IndexedPointsTestUShort, UnsignedShortOffset0)
{ {
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(0); runTest(0);
} }
TEST_P(IndexedPointsTestUShort, UnsignedShortOffset1) TEST_P(IndexedPointsTestUShort, UnsignedShortOffset1)
{ {
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(1); runTest(1);
} }
TEST_P(IndexedPointsTestUShort, UnsignedShortOffset2) TEST_P(IndexedPointsTestUShort, UnsignedShortOffset2)
{ {
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(2); runTest(2);
} }
TEST_P(IndexedPointsTestUShort, UnsignedShortOffset3) TEST_P(IndexedPointsTestUShort, UnsignedShortOffset3)
{ {
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(3); runTest(3);
} }
...@@ -310,9 +274,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset0) ...@@ -310,9 +274,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset0)
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848 // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(0, true); runTest(0, true);
} }
...@@ -321,9 +282,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset1) ...@@ -321,9 +282,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset1)
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848 // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(1, true); runTest(1, true);
} }
...@@ -332,9 +290,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset2) ...@@ -332,9 +290,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset2)
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848 // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(2, true); runTest(2, true);
} }
...@@ -343,9 +298,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset3) ...@@ -343,9 +298,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset3)
// TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848 // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(3, true); runTest(3, true);
} }
...@@ -357,9 +309,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffsetChangingIndice ...@@ -357,9 +309,6 @@ TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffsetChangingIndice
// TODO(fjhenigman): Figure out why this fails on Ozone Intel. // TODO(fjhenigman): Figure out why this fails on Ozone Intel.
ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel() && IsOpenGLES());
// http://anglebug.com/2599: Fails on the 5x due to driver bug.
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
runTest(3, true); runTest(3, true);
runTest(1, true); runTest(1, true);
runTest(0, true); runTest(0, true);
......
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