Add end2end test for AdvancedSyncVertexArray
This is just a port of the upstream test:
KHR-GLES31.core.shader_image_load_store.advanced-sync-vertexArray
Test: ComputeShaderTest.AdvancedSyncVertexArray
Bug: b/416573908
Change-Id: Id04af0a7efa667b7afc8061a9ccaa044e709fe1d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6496293
Auto-Submit: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Charlie Lao <cclao@google.com>
Reviewed-by: Charlie Lao <cclao@google.com>
diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
index eef107f..4e87c38 100644
--- a/src/tests/angle_end2end_tests_expectations.txt
+++ b/src/tests/angle_end2end_tests_expectations.txt
@@ -1747,6 +1747,7 @@
// Fails on D3D11
412738262 D3D11 : AtomicCounterBufferTest31.AtomicCounterQueries/* = SKIP
+416573908 D3D11 : ComputeShaderTest.AdvancedSyncVertexArray/* = SKIP
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// Slow tests, should appear last in this file
diff --git a/src/tests/gl_tests/ComputeShaderTest.cpp b/src/tests/gl_tests/ComputeShaderTest.cpp
index 802db8f..fa45098 100644
--- a/src/tests/gl_tests/ComputeShaderTest.cpp
+++ b/src/tests/gl_tests/ComputeShaderTest.cpp
@@ -4378,6 +4378,207 @@
glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER);
}
+// This test mirrors a dEQP test that is failing on some platforms
+// - KHR-GLES31.core.shader_image_load_store.advanced-sync-vertexArray
+// The test has three pipelines:
+// - First uses a vertex shader to store data to images
+// - Second uses a compute shader to read from those images and store to buffers
+// - Third uses those buffers as vertex input to render a color
+// It does this twice with different colors, and we were failing the second pass.
+// http://anglebug.com/416573908
+TEST_P(ComputeShaderTest, AdvancedSyncVertexArray)
+{
+ GLint maxVertexImageUniforms = 0;
+ glGetIntegerv(GL_MAX_VERTEX_IMAGE_UNIFORMS, &maxVertexImageUniforms);
+ ANGLE_SKIP_TEST_IF(maxVertexImageUniforms < 3);
+
+ constexpr char kCopyCS[] = R"(#version 310 es
+#define KSIZE 4
+layout (local_size_x = KSIZE) in;
+
+layout(rgba32f, binding = 0) readonly uniform highp image2D positionImage;
+layout(rgba32f, binding = 1) readonly uniform highp image2D colorImage;
+layout(r32ui, binding = 2) readonly uniform highp uimage2D elementImage;
+
+layout(std430, binding = 1) buffer positionBuffer {
+ vec2 position[KSIZE];
+};
+layout(std430, binding = 2) buffer colorBuffer {
+ vec4 color[KSIZE];
+};
+layout(std430, binding = 3) buffer elementBuffer {
+ uint element[KSIZE];
+};
+
+void main() {
+ ivec2 coord = ivec2(gl_LocalInvocationID.x, 0);
+
+ position[coord.x] = imageLoad(positionImage, coord).xy;
+ color[coord.x] = imageLoad(colorImage, coord);
+ element[coord.x] = uint(imageLoad(elementImage, coord).x);
+})";
+
+ constexpr char kStoreVS[] = R"(#version 310 es
+layout(rgba32f, binding = 0) writeonly uniform highp image2D positionImage;
+layout(rgba32f, binding = 1) writeonly uniform highp image2D colorImage;
+layout(r32ui, binding = 2) writeonly uniform highp uimage2D elementImage;
+
+uniform vec4 inColor;
+
+void main() {
+ vec2[4] data = vec2[4](vec2(-1, -1), vec2(1, -1), vec2(-1, 1), vec2(1, 1));
+
+ imageStore(positionImage, ivec2(gl_VertexID, 0), vec4(data[gl_VertexID], 0.0, 1.0));
+ imageStore(colorImage, ivec2(gl_VertexID, 0), inColor);
+ imageStore(elementImage, ivec2(gl_VertexID, 0), uvec4(gl_VertexID));
+})";
+
+ constexpr char kStoreFS[] = R"(#version 310 es
+precision mediump float;
+
+void main() {
+ discard;
+})";
+
+ constexpr char kDrawVS[] = R"(#version 310 es
+layout(location = 0) in vec4 inPosition;
+layout(location = 1) in vec4 inColor;
+
+out vec4 vsColor;
+
+void main() {
+ gl_Position = inPosition;
+ vsColor = inColor;
+})";
+
+ constexpr char kDrawFS[] = R"(#version 310 es
+precision mediump float;
+
+in vec4 vsColor;
+layout(location = 0) out vec4 outColor;
+
+void main() {
+ outColor = vsColor;
+})";
+
+ // The store program writes values to images
+ ANGLE_GL_PROGRAM(storeProgram, kStoreVS, kStoreFS);
+ // The compute program copies from images to buffers
+ ANGLE_GL_COMPUTE_PROGRAM(copyProgram, kCopyCS);
+ // The draw program reads from vertex input buffers
+ ANGLE_GL_PROGRAM(drawProgram, kDrawVS, kDrawFS);
+ EXPECT_GL_NO_ERROR();
+
+ GLint inColorLoc = glGetUniformLocation(storeProgram, "inColor");
+ ASSERT_NE(inColorLoc, -1);
+
+ GLuint texture[3];
+ glGenTextures(3, texture);
+ glBindTexture(GL_TEXTURE_2D, texture[0]);
+ glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32F, 4, 1);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glBindTexture(GL_TEXTURE_2D, texture[1]);
+ glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32F, 4, 1);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glBindTexture(GL_TEXTURE_2D, texture[2]);
+ glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 4, 1);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ EXPECT_GL_NO_ERROR();
+
+ GLuint attribless_vao;
+ GLuint draw_vao;
+ glGenVertexArrays(1, &attribless_vao);
+ glGenVertexArrays(1, &draw_vao);
+ glBindVertexArray(draw_vao);
+ EXPECT_GL_NO_ERROR();
+
+ GLuint position_buffer;
+ glGenBuffers(1, &position_buffer);
+ glBindBuffer(GL_ARRAY_BUFFER, position_buffer);
+ glBufferData(GL_ARRAY_BUFFER, 4 * 4 * 4, 0, GL_STATIC_DRAW);
+ glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
+ EXPECT_GL_NO_ERROR();
+
+ GLuint color_buffer;
+ glGenBuffers(1, &color_buffer);
+ glBindBuffer(GL_ARRAY_BUFFER, color_buffer);
+ glBufferData(GL_ARRAY_BUFFER, 4 * 4 * 4, 0, GL_STATIC_DRAW);
+ glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, 0, 0);
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+ glEnableVertexAttribArray(0);
+ glEnableVertexAttribArray(1);
+ EXPECT_GL_NO_ERROR();
+
+ GLuint element_buffer;
+ glGenBuffers(1, &element_buffer);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, element_buffer);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, 4 * 4 * 4, 0, GL_STATIC_DRAW);
+ EXPECT_GL_NO_ERROR();
+
+ glBindVertexArray(0);
+ // Vertex position
+ glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_WRITE, GL_RGBA32F);
+ // Vertex color
+ glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_READ_WRITE, GL_RGBA32F);
+ // Vertex ID
+ glBindImageTexture(2, texture[2], 0, GL_FALSE, 0, GL_READ_WRITE, GL_R32UI);
+ EXPECT_GL_NO_ERROR();
+
+ // Store Vertex Positions, GREEN, and Vertex ID to the images
+ glUseProgram(storeProgram);
+ glUniform4f(inColorLoc, 0.0f, 1.0f, 0.0f, 1.0f);
+ glBindVertexArray(attribless_vao);
+ glDrawArrays(GL_POINTS, 0, 4);
+ EXPECT_GL_NO_ERROR();
+
+ // Copy GREEN from images to vertex array buffers
+ glUseProgram(copyProgram);
+ glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, position_buffer);
+ glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, color_buffer);
+ glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, element_buffer);
+ glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
+ glDispatchCompute(1, 1, 1);
+ EXPECT_GL_NO_ERROR();
+
+ // Draw GREEN using the incoming vertex data
+ glClear(GL_COLOR_BUFFER_BIT);
+ glUseProgram(drawProgram);
+ glBindVertexArray(draw_vao);
+ glMemoryBarrier(GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT | GL_ELEMENT_ARRAY_BARRIER_BIT);
+ glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_INT, 0);
+ EXPECT_GL_NO_ERROR();
+
+ // Check for GREEN
+ EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
+
+ // Store Vertex Positions, BLUE, and Vertex ID to the images
+ glUseProgram(storeProgram);
+ glUniform4f(inColorLoc, 0.0f, 0.0f, 1.0f, 1.0f);
+ glBindVertexArray(attribless_vao);
+ glDrawArrays(GL_POINTS, 0, 4);
+ EXPECT_GL_NO_ERROR();
+
+ // Copy BLUE from images to vertex array buffers
+ glUseProgram(copyProgram);
+ glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
+ glDispatchCompute(1, 1, 1);
+ EXPECT_GL_NO_ERROR();
+
+ // Draw BLUE using incoming vertex data
+ glClear(GL_COLOR_BUFFER_BIT);
+ glUseProgram(drawProgram);
+ glBindVertexArray(draw_vao);
+ glMemoryBarrier(GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT | GL_ELEMENT_ARRAY_BARRIER_BIT);
+ glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_INT, 0);
+ EXPECT_GL_NO_ERROR();
+
+ // Check for BLUE
+ EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
+}
+
// Validate that on Vulkan, compute pipeline is correctly bound after an internal dispatch call is
// made. Blit stencil may issue a dispatch call.
TEST_P(ComputeShaderTest, DispatchBlitStencilDispatch)
