From: Mika Isojärvi <misojarvi@google.com>
Date: Wed, 22 Feb 2017 21:25:59 +0000 (-0800)
Subject: Fix tessellation support checks in negative binding tests
X-Git-Tag: upstream/0.1.0~445^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=698b72833550b2a6a5bbf3751eb2a7da153efd83;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix tessellation support checks in negative binding tests

Bug: 35618877
Test: Run the tests on couple of devices supporting tessellation
Change-Id: Ieca6a28a57a278a07ff688f760eb7da807e66d49
---

diff --git a/modules/gles31/functional/es31fLayoutBindingTests.cpp b/modules/gles31/functional/es31fLayoutBindingTests.cpp
index 242b43e..bcb8fd9 100644
--- a/modules/gles31/functional/es31fLayoutBindingTests.cpp
+++ b/modules/gles31/functional/es31fLayoutBindingTests.cpp
@@ -773,20 +773,33 @@ void LayoutBindingNegativeCase::init (void)
 	m_tessSupport = m_context.getContextInfo().isExtensionSupported("GL_EXT_tessellation_shader")
 					|| contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2));
 
-	int numShaderStages = (!m_tessSupport) ? 2 : 4;
+	if (!m_tessSupport && (m_shaderType == SHADERTYPE_TESS_EVALUATION || m_shaderType == SHADERTYPE_TESS_CONTROL))
+		TCU_THROW(NotSupportedError, "Tesselation shaders not supported");
+
+	int numShaderStages = m_tessSupport ? 4 : 2;
 
 	gl.getIntegerv(m_maxVertexUnitsEnum, &maxVertexUnits);
 	gl.getIntegerv(m_maxFragmentUnitsEnum, &maxFragmentUnits);
-	gl.getIntegerv(m_maxTessCtrlUnitsEnum, &maxTessCtrlUnits);
-	gl.getIntegerv(m_maxTessEvalUnitsEnum, &maxTessEvalUnits);
+
+	if (m_tessSupport)
+	{
+		gl.getIntegerv(m_maxTessCtrlUnitsEnum, &maxTessCtrlUnits);
+		gl.getIntegerv(m_maxTessEvalUnitsEnum, &maxTessEvalUnits);
+	}
+
 	gl.getIntegerv(m_maxCombinedUnitsEnum, &maxCombinedUnits);
 	gl.getIntegerv(m_maxBindingPointEnum, &numBindingPoints);
 	GLU_EXPECT_NO_ERROR(gl.getError(), "Querying available uniform numbers failed");
 
 	m_testCtx.getLog() << tcu::TestLog::Message << "Maximum units for uniform type in the vertex shader: " << maxVertexUnits << tcu::TestLog::EndMessage;
 	m_testCtx.getLog() << tcu::TestLog::Message << "Maximum units for uniform type in the fragment shader: " << maxFragmentUnits << tcu::TestLog::EndMessage;
-	m_testCtx.getLog() << tcu::TestLog::Message << "Maximum units for uniform type in the tessellation control shader: " << maxTessCtrlUnits << tcu::TestLog::EndMessage;
-	m_testCtx.getLog() << tcu::TestLog::Message << "Maximum units for uniform type in the tessellation evaluation shader: " << maxTessCtrlUnits << tcu::TestLog::EndMessage;
+
+	if (m_tessSupport)
+	{
+		m_testCtx.getLog() << tcu::TestLog::Message << "Maximum units for uniform type in the tessellation control shader: " << maxTessCtrlUnits << tcu::TestLog::EndMessage;
+		m_testCtx.getLog() << tcu::TestLog::Message << "Maximum units for uniform type in the tessellation evaluation shader: " << maxTessCtrlUnits << tcu::TestLog::EndMessage;
+	}
+
 	m_testCtx.getLog() << tcu::TestLog::Message << "Maximum combined units for uniform type: " << maxCombinedUnits << tcu::TestLog::EndMessage;
 	m_testCtx.getLog() << tcu::TestLog::Message << "Maximum binding point for uniform type: " << numBindingPoints-1 << tcu::TestLog::EndMessage;
 
@@ -832,13 +845,13 @@ void LayoutBindingNegativeCase::init (void)
 			{
 				// leave room for contradictory case
 				if (maxUnits < 3)
-					throw tcu::NotSupportedError("Not enough uniforms available for test");
+					TCU_THROW(NotSupportedError, "Not enough uniforms available for test");
 				m_numBindings = rnd.getInt(2, deMin32(MAX_UNIFORM_ARRAY_SIZE, maxUnits-1));
 			}
 			else
 			{
 				if (maxUnits < 2)
-					throw tcu::NotSupportedError("Not enough uniforms available for test");
+					TCU_THROW(NotSupportedError, "Not enough uniforms available for test");
 				m_numBindings = rnd.getInt(2, deMin32(MAX_UNIFORM_ARRAY_SIZE, maxUnits));
 			}
 			break;
@@ -848,23 +861,27 @@ void LayoutBindingNegativeCase::init (void)
 	}
 
 	// Check that we have enough uniforms in different shaders to perform the tests
-	if ( ((m_shaderType == SHADERTYPE_VERTEX) || (m_shaderType == SHADERTYPE_ALL)) && (maxVertexUnits < m_numBindings) )
-		throw tcu::NotSupportedError("Vertex shader: not enough uniforms available for test");
-	if ( ((m_shaderType == SHADERTYPE_FRAGMENT) || (m_shaderType == SHADERTYPE_ALL)) && (maxFragmentUnits < m_numBindings) )
-		throw tcu::NotSupportedError("Fragment shader: not enough uniforms available for test");
-	if ( (m_tessSupport) && ((m_shaderType == SHADERTYPE_TESS_CONTROL) || (m_shaderType == SHADERTYPE_ALL)) && (maxTessCtrlUnits < m_numBindings) )
-		throw tcu::NotSupportedError("Tessellation control shader: not enough uniforms available for test");
-	if ( (m_tessSupport) && ((m_shaderType == SHADERTYPE_TESS_EVALUATION) || (m_shaderType == SHADERTYPE_ALL)) && (maxTessEvalUnits < m_numBindings) )
-		throw tcu::NotSupportedError("Tessellation evaluation shader: not enough uniforms available for test");
-
-	if ( (m_shaderType == SHADERTYPE_ALL) && (maxCombinedUnits < m_numBindings*numShaderStages) )
-		throw tcu::NotSupportedError("Not enough uniforms available for test");
+	if (((m_shaderType == SHADERTYPE_VERTEX) || (m_shaderType == SHADERTYPE_ALL)) && (maxVertexUnits < m_numBindings) )
+		TCU_THROW(NotSupportedError, "Vertex shader: not enough uniforms available for test");
+
+	if (((m_shaderType == SHADERTYPE_FRAGMENT) || (m_shaderType == SHADERTYPE_ALL)) && (maxFragmentUnits < m_numBindings) )
+		TCU_THROW(NotSupportedError, "Fragment shader: not enough uniforms available for test");
+
+	if (m_tessSupport && ((m_shaderType == SHADERTYPE_TESS_CONTROL) || (m_shaderType == SHADERTYPE_ALL)) && (maxTessCtrlUnits < m_numBindings) )
+		TCU_THROW(NotSupportedError, "Tessellation control shader: not enough uniforms available for test");
+
+	if (m_tessSupport && ((m_shaderType == SHADERTYPE_TESS_EVALUATION) || (m_shaderType == SHADERTYPE_ALL)) && (maxTessEvalUnits < m_numBindings) )
+		TCU_THROW(NotSupportedError, "Tessellation evaluation shader: not enough uniforms available for test");
+
+	if ((m_shaderType == SHADERTYPE_ALL) && (maxCombinedUnits < m_numBindings*numShaderStages) )
+		TCU_THROW(NotSupportedError, "Not enough uniforms available for test");
 
 	// Check that we have enough binding points to perform the tests
 	if (numBindingPoints < m_numBindings)
-		throw tcu::NotSupportedError("Not enough binding points available for test");
+		TCU_THROW(NotSupportedError, "Not enough binding points available for test");
+
 	if (m_errorType == ERRORTYPE_CONTRADICTORY && numBindingPoints == m_numBindings)
-		throw tcu::NotSupportedError("Not enough binding points available for test");
+		TCU_THROW(NotSupportedError, "Not enough binding points available for test");
 
 	// Initialize the binding points i.e. populate the two binding point vectors
 	initBindingPoints(0, numBindingPoints);