Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts...

[platform/upstream/VK-GL-CTS.git] / modules / gles31 / functional / es31fProgramInterfaceQueryTests.cpp

diff --git a/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp b/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp
index 2b06602..f8eb8d7 100644 (file)
--- a/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp
+++ b/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp
@@ -425,7 +425,6 @@ public:
        bool            isStagePresent          (glu::ShaderType stage) const;
        bool            isStageReferencing      (glu::ShaderType stage) const;
 
-       deUint32        getPresentMask          (void) const;
        deUint32        getReferencingMask      (void) const;
 
        const glu::GLSLVersion  m_version;
@@ -483,17 +482,6 @@ bool ShaderSet::isStageReferencing (glu::ShaderType stage) const
        return m_stageReferencing[stage];
 }
 
-deUint32 ShaderSet::getPresentMask (void) const
-{
-       deUint32 mask = 0;
-       for (deUint32 stage = 0; stage < glu::SHADERTYPE_LAST; ++stage)
-       {
-               if (m_stagePresent[stage])
-                       mask |= (1u << stage);
-       }
-       return mask;
-}
-
 deUint32 ShaderSet::getReferencingMask (void) const
 {
        deUint32 mask = 0;
@@ -4501,7 +4489,7 @@ static ResourceDefinition::Node::SharedPtr generateRandomExtShaderSet (de::Rando
                const glu::ShaderType                                           shaderType      = (selector == 0) ? (glu::SHADERTYPE_GEOMETRY)
                                                                                                                                : (selector == 1) ? (glu::SHADERTYPE_TESSELLATION_CONTROL)
                                                                                                                                : (selector == 2) ? (glu::SHADERTYPE_TESSELLATION_EVALUATION)
-                                                                                                                               :                                       (glu::SHADERTYPE_LAST);
+                                                                                                                               :                                       (glu::SHADERTYPE_LAST);
 
                return ResourceDefinition::Node::SharedPtr(new ResourceDefinition::Shader(program, shaderType, glu::GLSL_VERSION_310_ES));
        }