Skip to content

Commit 557e385

Browse files
ShabbyXCommit Bot
authored andcommitted
Vulkan: Disable atomic counter buffer tests on AMD/Windows
A likely driver bug is causing the subsequent OpenGL test to fail. Bug: angleproject:3738 Change-Id: I6ee5e9e7298a2adb3069a6e14ac83453fa34b50f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1716056 Reviewed-by: Yuly Novikov <[email protected]> Commit-Queue: Shahbaz Youssefi <[email protected]>
1 parent 8bb46c5 commit 557e385

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

src/tests/gl_tests/AtomicCounterBufferTest.cpp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ class AtomicCounterBufferTest : public ANGLETest
3232
// Test GL_ATOMIC_COUNTER_BUFFER is not supported with version lower than ES31.
3333
TEST_P(AtomicCounterBufferTest, AtomicCounterBufferBindings)
3434
{
35+
// Causes crashes in the subsequent OpenGL testing of this function. http://anglebug.com/3738
36+
ANGLE_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsAMD());
37+
3538
ASSERT_EQ(3, getClientMajorVersion());
3639
GLBuffer atomicCounterBuffer;
3740
glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, atomicCounterBuffer.get());
@@ -51,6 +54,9 @@ class AtomicCounterBufferTest31 : public AtomicCounterBufferTest
5154
// Linking should fail if counters in vertex shader exceed gl_MaxVertexAtomicCounters.
5255
TEST_P(AtomicCounterBufferTest31, ExceedMaxVertexAtomicCounters)
5356
{
57+
// Causes crashes in the subsequent OpenGL testing of this function. http://anglebug.com/3738
58+
ANGLE_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsAMD());
59+
5460
constexpr char kVS[] =
5561
"#version 310 es\n"
5662
"layout(binding = 0) uniform atomic_uint foo[gl_MaxVertexAtomicCounters + 1];\n"
@@ -72,6 +78,9 @@ TEST_P(AtomicCounterBufferTest31, ExceedMaxVertexAtomicCounters)
7278
// GLSL ES Spec 3.10.4, section 9.2.1.
7379
TEST_P(AtomicCounterBufferTest31, OffsetNotAllSpecified)
7480
{
81+
// Causes crashes in the subsequent OpenGL testing of this function. http://anglebug.com/3738
82+
ANGLE_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsAMD());
83+
7584
constexpr char kVS[] =
7685
"#version 310 es\n"
7786
"layout(binding = 0, offset = 4) uniform atomic_uint foo;\n"
@@ -94,6 +103,9 @@ TEST_P(AtomicCounterBufferTest31, OffsetNotAllSpecified)
94103
// value.
95104
TEST_P(AtomicCounterBufferTest31, OffsetNotAllSpecifiedWithSameValue)
96105
{
106+
// Causes crashes in the subsequent OpenGL testing of this function. http://anglebug.com/3738
107+
ANGLE_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsAMD());
108+
97109
constexpr char kVS[] =
98110
"#version 310 es\n"
99111
"layout(binding = 0, offset = 4) uniform atomic_uint foo;\n"
@@ -115,6 +127,9 @@ TEST_P(AtomicCounterBufferTest31, OffsetNotAllSpecifiedWithSameValue)
115127
// Tests atomic counter reads using compute shaders. Used as a sanity check for the translator.
116128
TEST_P(AtomicCounterBufferTest31, AtomicCounterReadCompute)
117129
{
130+
// Causes crashes in the subsequent OpenGL testing of this function. http://anglebug.com/3738
131+
ANGLE_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsAMD());
132+
118133
// Skipping due to a bug on the Adreno OpenGLES Android driver.
119134
// http://anglebug.com/2925
120135
ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
@@ -143,6 +158,9 @@ void main()
143158
// Test atomic counter read.
144159
TEST_P(AtomicCounterBufferTest31, AtomicCounterRead)
145160
{
161+
// Causes crashes in the subsequent OpenGL testing of this function. http://anglebug.com/3738
162+
ANGLE_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsAMD());
163+
146164
// Skipping test while we work on enabling atomic counter buffer support in th D3D renderer.
147165
// http://anglebug.com/1729
148166
ANGLE_SKIP_TEST_IF(IsD3D11());
@@ -179,6 +197,9 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterRead)
179197
// Test atomic counter increment and decrement.
180198
TEST_P(AtomicCounterBufferTest31, AtomicCounterIncrementAndDecrement)
181199
{
200+
// Causes crashes in the subsequent OpenGL testing of this function. http://anglebug.com/3738
201+
ANGLE_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsAMD());
202+
182203
constexpr char kCS[] =
183204
"#version 310 es\n"
184205
"layout(local_size_x=1, local_size_y=1, local_size_z=1) in;\n"
@@ -220,6 +241,9 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterIncrementAndDecrement)
220241
// Tests multiple atomic counter buffers.
221242
TEST_P(AtomicCounterBufferTest31, AtomicCounterMultipleBuffers)
222243
{
244+
// Causes crashes in the subsequent OpenGL testing of this function. http://anglebug.com/3738
245+
ANGLE_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsAMD());
246+
223247
GLint maxAtomicCounterBuffers = 0;
224248
glGetIntegerv(GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS, &maxAtomicCounterBuffers);
225249
constexpr unsigned int kBufferCount = 3;

0 commit comments

Comments
 (0)