GLES2: fix typo in es2fShaderStructTests
authorKai Ninomiya <kainino@chromium.org>
Mon, 29 Jan 2018 18:55:22 +0000 (10:55 -0800)
committerChris Forbes <chrisforbes@google.com>
Mon, 29 Jan 2018 22:06:22 +0000 (22:06 +0000)
I happened to notice this typo while editing the file. It could cause
some tests to be skipped when they should not be: it skips a case if
(1) the device has no vertex texture image units and
(2) the case uses any flags at all and
(3) the case is a vertex case.

There could be conformance impact from this change.

Affects:
  dEQP-GLES2.functional.shaders.struct.uniform.array_member_dynamic_index_vertex
  dEQP-GLES2.functional.shaders.struct.uniform.struct_array_dynamic_index_vertex
  dEQP-GLES2.functional.shaders.struct.uniform.nested_struct_array_dynamic_index_vertex
  dEQP-GLES2.functional.shaders.struct.uniform.dynamic_loop_struct_array_vertex
  dEQP-GLES2.functional.shaders.struct.uniform.dynamic_loop_nested_struct_array_vertex
Components: AOSP

Change-Id: I5110d6c240938bc58664e7dd5ee2b43e26ceea6e

modules/gles2/functional/es2fShaderStructTests.cpp

index 292c526..21d84c5 100644 (file)
@@ -111,7 +111,7 @@ void ShaderStructCase::init (void)
                                throw tcu::NotSupportedError("Dynamic loops not supported");
                }
 
-               if ((m_flags && FLAG_USES_TEXTURES) && m_isVertexCase)
+               if ((m_flags & FLAG_USES_TEXTURES) && m_isVertexCase)
                {
                        int numTextures = 0;
                        m_renderCtx.getFunctions().getIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &numTextures);