Merge vk-gl-cts/opengl-cts-4.6.1 into vk-gl-cts/opengl-cts-4.6.2
Change-Id: I24c86700dd7f7aca4ba10561bc329136f7d9e303
diff --git a/external/openglcts/modules/gl/gl4cShaderImageLoadStoreTests.cpp b/external/openglcts/modules/gl/gl4cShaderImageLoadStoreTests.cpp
index cd89ec1..902ff31 100644
--- a/external/openglcts/modules/gl/gl4cShaderImageLoadStoreTests.cpp
+++ b/external/openglcts/modules/gl/gl4cShaderImageLoadStoreTests.cpp
@@ -6055,6 +6055,8 @@
glBindProgramPipeline(m_pipeline[1]);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+ glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
+
std::vector<vec4> data(width * height * 8);
glGetTexImage(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, GL_FLOAT, &data[0]);
@@ -6501,6 +6503,8 @@
glBindVertexArray(m_vao);
glDrawElementsInstancedBaseInstance(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, 0, 1, 0);
+ glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
+
std::vector<vec4> rdata(width * height);
glBindTexture(GL_TEXTURE_2D, m_texture[1]);
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_FLOAT, &rdata[0]);
