commit 1d463a0af03170dc5306552bb9128fc782e9866d
author Mika Isojärvi <misojarvi@google.com> Wed Mar 16 13:30:22 2016 -0700
committer Mika Isojärvi <misojarvi@google.com> Wed Mar 16 13:30:22 2016 -0700
tree faa2266e3ccd6bfe37ce8327a19b6001d1369a33
parent de7fb14fc30a8dd60e0215c333950b6a996c825a

Fix cube map array extension checks in opaque indexing tests

Bug: 27570992
Change-Id: I7be5792ac51331e171cd6194f2c50e47307210ae

modules/gles31/functional/es31fOpaqueTypeIndexingTests.cpp

diff --git a/modules/gles31/functional/es31fOpaqueTypeIndexingTests.cpp b/modules/gles31/functional/es31fOpaqueTypeIndexingTests.cpp
index 46670ca..c605740 100644
--- a/modules/gles31/functional/es31fOpaqueTypeIndexingTests.cpp
+++ b/modules/gles31/functional/es31fOpaqueTypeIndexingTests.cpp
@@ -381,9 +381,9 @@
 				"GL_EXT_gpu_shader5 extension is required for dynamic indexing of sampler arrays.");
 
 		if (m_samplerType == TYPE_SAMPLER_CUBE_ARRAY
-			&& m_samplerType == TYPE_SAMPLER_CUBE_ARRAY_SHADOW
-			&& m_samplerType == TYPE_INT_SAMPLER_CUBE_ARRAY
-			&& m_samplerType == TYPE_UINT_SAMPLER_CUBE_ARRAY)
+			|| m_samplerType == TYPE_SAMPLER_CUBE_ARRAY_SHADOW
+			|| m_samplerType == TYPE_INT_SAMPLER_CUBE_ARRAY
+			|| m_samplerType == TYPE_UINT_SAMPLER_CUBE_ARRAY)
 		{
 			TCU_CHECK_AND_THROW(NotSupportedError,
 				m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_cube_map_array"),
@@ -410,10 +410,10 @@
 		global << "#extension GL_EXT_gpu_shader5 : require\n";
 
 	if (!isES32
-		&& m_samplerType == TYPE_SAMPLER_CUBE_ARRAY
-		&& m_samplerType == TYPE_SAMPLER_CUBE_ARRAY_SHADOW
-		&& m_samplerType == TYPE_INT_SAMPLER_CUBE_ARRAY
-		&& m_samplerType == TYPE_UINT_SAMPLER_CUBE_ARRAY)
+		&& (m_samplerType == TYPE_SAMPLER_CUBE_ARRAY
+			|| m_samplerType == TYPE_SAMPLER_CUBE_ARRAY_SHADOW
+			|| m_samplerType == TYPE_INT_SAMPLER_CUBE_ARRAY
+			|| m_samplerType == TYPE_UINT_SAMPLER_CUBE_ARRAY))
 	{
 		global << "#extension GL_EXT_texture_cube_map_array: require\n";
 	}