From: Tate Hornbeck Date: Wed, 27 Jun 2018 16:53:11 +0000 (-0400) Subject: Remove shaders.negative.unused_uniform_precision_matching X-Git-Tag: upstream/1.3.5~2133^2~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d463e716ab9331f978e317747cd3f2383c7b01d;p=platform%2Fupstream%2FVK-GL-CTS.git Remove shaders.negative.unused_uniform_precision_matching The GLSL spec was updated to "the types, precisions and any location specifiers of all statically used uniform variables with the same name must match across shaders that are linked into a single program." which makes the unused_uniform_precision_matching test invalid. Updating this test to use statically used uniforms would be redundant to used_uniform_precision_matching. Components: OpenGL VK-GL-CTS issue: 1249 Affects: KHR-GLES32.shaders.negative.unused_uniform_precision_matching Change-Id: I6a60c9355144f1d539a6463d913844129e6dfc8d --- diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-spec-issues.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-spec-issues.txt index e15de3a..e69de29 100644 --- a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-spec-issues.txt +++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-spec-issues.txt @@ -1,2 +0,0 @@ -#OpenGL/GLSL issue 14 -KHR-GLES32.shaders.negative.unused_uniform_precision_matching diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles32-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles32-khr-master.txt index e1143ef..6276c0e 100644 --- a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles32-khr-master.txt +++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles32-khr-master.txt @@ -14,7 +14,6 @@ KHR-GLES32.shaders.shader_integer_mix.mix-bvec4 KHR-GLES32.shaders.negative.initialize KHR-GLES32.shaders.negative.constant_sequence KHR-GLES32.shaders.negative.used_uniform_precision_matching -KHR-GLES32.shaders.negative.unused_uniform_precision_matching KHR-GLES32.shaders.aggressive_optimizations.sin_float_vert KHR-GLES32.shaders.aggressive_optimizations.sin_float_frag KHR-GLES32.shaders.aggressive_optimizations.sin_vec2_vert diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt index e1143ef..6276c0e 100644 --- a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt +++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt @@ -14,7 +14,6 @@ KHR-GLES32.shaders.shader_integer_mix.mix-bvec4 KHR-GLES32.shaders.negative.initialize KHR-GLES32.shaders.negative.constant_sequence KHR-GLES32.shaders.negative.used_uniform_precision_matching -KHR-GLES32.shaders.negative.unused_uniform_precision_matching KHR-GLES32.shaders.aggressive_optimizations.sin_float_vert KHR-GLES32.shaders.aggressive_optimizations.sin_float_frag KHR-GLES32.shaders.aggressive_optimizations.sin_vec2_vert diff --git a/external/openglcts/modules/common/glcShaderNegativeTests.cpp b/external/openglcts/modules/common/glcShaderNegativeTests.cpp index 00766f4..6c3425f 100644 --- a/external/openglcts/modules/common/glcShaderNegativeTests.cpp +++ b/external/openglcts/modules/common/glcShaderNegativeTests.cpp @@ -316,37 +316,10 @@ void ShaderNegativeTests::init(void) }; unsigned int used_variables_variants_count = sizeof(used_variables_variants) / sizeof(ShaderVariants); - static const ShaderVariants unused_variables_variants[] = { - /* These variants should pass since the precision qualifiers match. - * These variants require highp to be supported, so will not be run for GLSL_VERSION_100_ES. - */ - { GLSL_VERSION_300_ES, "", "gl_Position = vec4(1.0);", "highp", "result = value;", true }, - { GLSL_VERSION_300_ES, "highp", "gl_Position = vec4(1.0);", "highp", "result = value;", true }, - - /* Use highp in vertex shaders, mediump in fragment shaders. Check variations as above. - * These variants should fail since the precision qualifiers do not match, and matching is done - * based on declaration - independent of static use. - */ - { GLSL_VERSION_100_ES, "", "gl_Position = vec4(1.0);", "mediump", "result = value;", false }, - { GLSL_VERSION_100_ES, "highp", "gl_Position = vec4(1.0);", "mediump", "result = value;", false }, - - /* Use mediump in vertex shaders, highp in fragment shaders. Check variations as above. - * These variations should fail for the same reason as above. - */ - { GLSL_VERSION_300_ES, "mediump", "gl_Position = vec4(1.0);", "highp", "result = vec4(1.0);", false }, - { GLSL_VERSION_300_ES, "mediump", "gl_Position = vec4(1.0);", "highp", "result = value;", false }, - }; - unsigned int unused_variables_variants_count = sizeof(unused_variables_variants) / sizeof(ShaderVariants); - addChild(new ShaderUniformPrecisionLinkCase( m_context, "used_uniform_precision_matching", "Verify that linking fails if precision qualifiers on default uniform do not match", used_variables_variants, used_variables_variants_count, m_glslVersion)); - - addChild(new ShaderUniformPrecisionLinkCase( - m_context, "unused_uniform_precision_matching", - "Verify that linking fails if precision qualifiers on default not used uniform do not match", - unused_variables_variants, unused_variables_variants_count, m_glslVersion)); } }