From: Mika Isojärvi <misojarvi@google.com>
Date: Thu, 31 Aug 2017 18:54:48 +0000 (-0700)
Subject: Fix missing SSBO binding in EGL robustness tests
X-Git-Tag: upstream/1.3.5~1205^2^2~3^2~42^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f2ac2085d7f6b2880e0c3baeaa877b4854d4941;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix missing SSBO binding in EGL robustness tests

Bug: 64845581
Bug: 65175642
Test: Ran the tests on couple of Google devices
Change-Id: I3a98fe12802e6951483499e800cd3fe7412e37f0
---

diff --git a/modules/egl/teglRobustnessTests.cpp b/modules/egl/teglRobustnessTests.cpp
index 8ddaa50..2521778 100644
--- a/modules/egl/teglRobustnessTests.cpp
+++ b/modules/egl/teglRobustnessTests.cpp
@@ -1339,15 +1339,27 @@ void ShadersOOB::setup (void)
 
 	// Create dummy data for filling buffer objects
 	const std::vector<tcu::Vec4> refValues(s_numBindings, tcu::Vec4(0.0f, 1.0f, 1.0f, 1.0f));
-	glw::GLenum resType = (m_isUBO) ? GL_UNIFORM_BUFFER : GL_SHADER_STORAGE_BUFFER;
 
-	if (!m_isLocalArray)
+	if (m_isLocalArray && m_shaderType == SHADERTYPE_COMPUTE)
+	{
+		// Setup output buffer
+		GLU_CHECK_GLW_CALL(m_gl, genBuffers((glw::GLsizei)1u, &m_buffers[0]));
+
+		GLU_CHECK_GLW_CALL(m_gl, bindBuffer(GL_SHADER_STORAGE_BUFFER, m_buffers[0]));
+		GLU_CHECK_GLW_CALL(m_gl, bufferData(GL_SHADER_STORAGE_BUFFER, sizeof(tcu::Vec4), &(refValues[0]), GL_STATIC_DRAW));
+		GLU_CHECK_GLW_CALL(m_gl, bindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_buffers[0]));
+	}
+	else if (!m_isLocalArray)
 	{
 		// Set up interface block of buffer bindings
 		GLU_CHECK_GLW_CALL(m_gl, genBuffers((glw::GLsizei)m_buffers.size(), &m_buffers[0]));
 
 		for (int bufNdx = 0; bufNdx < (int)m_buffers.size(); ++bufNdx)
 		{
+			const glw::GLenum resType	= m_isUBO && (m_shaderType != SHADERTYPE_COMPUTE || bufNdx != 0)
+										? GL_UNIFORM_BUFFER
+										: GL_SHADER_STORAGE_BUFFER;
+
 			GLU_CHECK_GLW_CALL(m_gl, bindBuffer(resType, m_buffers[bufNdx]));
 			GLU_CHECK_GLW_CALL(m_gl, bufferData(resType, sizeof(tcu::Vec4), &(refValues[bufNdx]), GL_STATIC_DRAW));
 			GLU_CHECK_GLW_CALL(m_gl, bindBufferBase(resType, bufNdx, m_buffers[bufNdx]));