Merge vk-gl-cts/opengl-cts-4.6.1 into vk-gl-cts/opengl-cts-4.6.2

Change-Id: I23862aa6176e7e167a048148d88bf577b43cd2c9

modules/gles31/functional/es31fShaderUniformIntegerFunctionTests.cpp

diff --git a/modules/gles31/functional/es31fShaderUniformIntegerFunctionTests.cpp b/modules/gles31/functional/es31fShaderUniformIntegerFunctionTests.cpp
index b1380a9..7a1cf11 100644
--- a/modules/gles31/functional/es31fShaderUniformIntegerFunctionTests.cpp
+++ b/modules/gles31/functional/es31fShaderUniformIntegerFunctionTests.cpp
@@ -98,10 +98,8 @@
 void UniformIntegerFunctionCase::init(void)
 {
     std::ostringstream oss;
-    oss << "result = " << getFunctionName()
-        << "(value);\n"
-           "comparison = ("
-        << getFunctionName() << "(value) == " << computeExpectedResult(m_input) << ");\n";
+    oss << "result = " << getFunctionName() << "(value);\n"
+        << "comparison = (" << getFunctionName() << "(value) == " << computeExpectedResult(m_input) << ");\n";
     m_spec.source = oss.str();
 
     DE_ASSERT(!m_executor);
@@ -117,7 +115,7 @@
 tcu::TestNode::IterateResult UniformIntegerFunctionCase::iterate(void)
 {
     int32_t result;
-    bool comparison;
+    int32_t comparison; // A bool in the shader, but we must use a 32-bit type to copy out into.
     vector<void *> outputPointers(2);
 
     outputPointers[0] = &result;