Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master

Change-Id: I1864199105595d697561bcb6641692edbe75aa79

diff --cc external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-master.txt
index fa283f6,fa283f6..1fc660d
--- 1/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-master.txt
--- 2/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/src/gles32-khr-master.txt
@@@ -14,7 -14,7 +14,6 @@@ KHR-GLES32.shaders.shader_integer_mix.m
  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.core.geometry_shader.adjacency.adjacency_non_indiced_lines
  KHR-GLES32.core.geometry_shader.adjacency.adjacency_indiced_lines
  KHR-GLES32.core.geometry_shader.adjacency.adjacency_non_indiced_line_strip

diff --cc modules/gles3/functional/es3fShaderDerivateTests.cpp
index 15013bf,0ff064c..87f629b
--- 1/modules/gles3/functional/es3fShaderDerivateTests.cpp
--- 2/modules/gles3/functional/es3fShaderDerivateTests.cpp
+++ b/modules/gles3/functional/es3fShaderDerivateTests.cpp
@@@ -1092,16 -1057,17 +1092,19 @@@ qpTestResult LinearDerivateCase::verif
  
        if (m_func == DERIVATE_DFDX || m_func == DERIVATE_DFDY)
        {
 -              const bool                      isX                     = m_func == DERIVATE_DFDX;
 -              const float                     div                     = isX ? float(result.getWidth()) : float(result.getHeight());
 -              const tcu::Vec4         scale           = isX ? xScale : yScale;
 -              tcu::Vec4                       reference       = ((m_coordMax - m_coordMin) / div);
 -              const tcu::Vec4         opThreshold     = getDerivateThreshold(m_precision, m_coordMin, m_coordMax, reference);
 -              const tcu::Vec4         threshold       = max(surfaceThreshold, opThreshold);
 -              const int                       numComps        = glu::getDataTypeFloatScalars(m_dataType);
 +              const bool                      isX                             = m_func == DERIVATE_DFDX;
 +              const float                     div                             = isX ? float(result.getWidth()) : float(result.getHeight());
 +              const tcu::Vec4         scale                   = isX ? xScale : yScale;
-               const tcu::Vec4         reference               = ((m_coordMax - m_coordMin) / div) * scale;
-               const tcu::Vec4         opThreshold             = getDerivateThreshold(m_precision, m_coordMin*scale, m_coordMax*scale, reference);
-               const tcu::Vec4         opThresholdW    = getDerivateThresholdWarning(m_precision, m_coordMin*scale, m_coordMax*scale, reference);
++              tcu::Vec4                       reference               = ((m_coordMax - m_coordMin) / div);
++              const tcu::Vec4         opThreshold             = getDerivateThreshold(m_precision, m_coordMin, m_coordMax, reference);
++              const tcu::Vec4         opThresholdW    = getDerivateThresholdWarning(m_precision, m_coordMin, m_coordMax, reference);
 +              const tcu::Vec4         threshold               = max(surfaceThreshold, opThreshold);
 +              const tcu::Vec4         thresholdW              = max(surfaceThreshold, opThresholdW);
 +              const int                       numComps                = glu::getDataTypeFloatScalars(m_dataType);
  
+               /* adjust the reference value for the correct dfdx or dfdy sample adjacency */
+               reference       = reference * scale;
+ 
                m_testCtx.getLog()
                        << tcu::TestLog::Message
                        << "Verifying result image.\n"
@@@ -1420,16 -1355,17 +1423,19 @@@ qpTestResult TextureDerivateCase::verif
  
        if (m_func == DERIVATE_DFDX || m_func == DERIVATE_DFDY)
        {
 -              const bool                      isX                     = m_func == DERIVATE_DFDX;
 -              const float                     div                     = isX ? w : h;
 -              const tcu::Vec4         scale           = isX ? xScale : yScale;
 -              tcu::Vec4                       reference       = ((m_texValueMax - m_texValueMin) / div);
 -              const tcu::Vec4         opThreshold     = getDerivateThreshold(m_precision, m_texValueMin, m_texValueMax, reference);
 -              const tcu::Vec4         threshold       = max(surfaceThreshold, opThreshold);
 -              const int                       numComps        = glu::getDataTypeFloatScalars(m_dataType);
 +              const bool                      isX                             = m_func == DERIVATE_DFDX;
 +              const float                     div                             = isX ? w : h;
 +              const tcu::Vec4         scale                   = isX ? xScale : yScale;
-               const tcu::Vec4         reference               = ((m_texValueMax - m_texValueMin) / div) * scale;
-               const tcu::Vec4         opThreshold             = getDerivateThreshold(m_precision, m_texValueMin*scale, m_texValueMax*scale, reference);
-               const tcu::Vec4         opThresholdW    = getDerivateThresholdWarning(m_precision, m_texValueMin*scale, m_texValueMax*scale, reference);
++              tcu::Vec4                       reference               = ((m_texValueMax - m_texValueMin) / div);
++              const tcu::Vec4         opThreshold             = getDerivateThreshold(m_precision, m_texValueMin, m_texValueMax, reference);
++              const tcu::Vec4         opThresholdW    = getDerivateThresholdWarning(m_precision, m_texValueMin, m_texValueMax, reference);
 +              const tcu::Vec4         threshold               = max(surfaceThreshold, opThreshold);
 +              const tcu::Vec4         thresholdW              = max(surfaceThreshold, opThresholdW);
 +              const int                       numComps                = glu::getDataTypeFloatScalars(m_dataType);
  
+               /* adjust the reference value for the correct dfdx or dfdy sample adjacency */
+               reference       = reference * scale;
+ 
                m_testCtx.getLog()
                        << tcu::TestLog::Message
                        << "Verifying result image.\n"