Merge vk-gl-cts/opengl-es-cts-3.2.6 into vk-gl-cts/opengl-es-cts-3.2.7

Change-Id: If02f4572aca30dfa8de4f63dbe22873efb3c7e6b

diff --cc modules/gles31/functional/es31fNegativeShaderApiTests.cpp
index 88ee474,effbf67..ff57141
--- 1/modules/gles31/functional/es31fNegativeShaderApiTests.cpp
--- 2/modules/gles31/functional/es31fNegativeShaderApiTests.cpp
+++ b/modules/gles31/functional/es31fNegativeShaderApiTests.cpp
@@@ -669,14 -653,14 +669,14 @@@ void get_sampler_parameterfv (NegativeT
  
  void get_sampler_parameterIiv (NegativeTestContext& ctx)
  {
 -      if (!contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)))
 +      if (!supportsES32orGL45(ctx))
                throw tcu::NotSupportedError("glGetSamplerParameterIiv is not supported.", DE_NULL, __FILE__, __LINE__);
  
-       GLuint  sampler         = 0x1234;
-       GLint   borderColor     = 0x1234;
+       GLuint  sampler                 = 0x1234;
+       GLint   borderColor[]   = { 0x1234, 0x4123, 0x3412, 0x2341 };
  
        ctx.beginSection("GL_INVALID_OPERATION is generated if sampler is not the name of a sampler object returned from a previous call to ctx.glGenSamplers.");
-       ctx.glGetSamplerParameterIiv(sampler, GL_TEXTURE_BORDER_COLOR, &borderColor);
+       ctx.glGetSamplerParameterIiv(sampler, GL_TEXTURE_BORDER_COLOR, &borderColor[0]);
        ctx.expectError(GL_INVALID_OPERATION);
        ctx.endSection();
  
@@@ -692,14 -676,14 +692,14 @@@
  
  void get_sampler_parameterIuiv (NegativeTestContext& ctx)
  {
 -      if (!contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)))
 +      if (!supportsES32orGL45(ctx))
                throw tcu::NotSupportedError("glGetSamplerParameterIuiv is not supported.", DE_NULL, __FILE__, __LINE__);
  
-       GLuint  sampler         = 0x1234;
-       GLuint  borderColor     = 0x1234;
+       GLuint  sampler                 = 0x1234;
+       GLuint  borderColor[]   = { 0x1234, 0x4123, 0x3412, 0x2341 };
  
        ctx.beginSection("GL_INVALID_OPERATION is generated if sampler is not the name of a sampler object returned from a previous call to ctx.glGenSamplers.");
-       ctx.glGetSamplerParameterIuiv(sampler, GL_TEXTURE_BORDER_COLOR, &borderColor);
+       ctx.glGetSamplerParameterIuiv(sampler, GL_TEXTURE_BORDER_COLOR, &borderColor[0]);
        ctx.expectError(GL_INVALID_OPERATION);
        ctx.endSection();
  

diff --cc modules/gles31/functional/es31fNegativeTextureApiTests.cpp
index 58c513f,b49a401..8523d33
--- 1/modules/gles31/functional/es31fNegativeTextureApiTests.cpp
--- 2/modules/gles31/functional/es31fNegativeTextureApiTests.cpp
+++ b/modules/gles31/functional/es31fNegativeTextureApiTests.cpp
@@@ -2249,10 -2228,10 +2249,10 @@@ void texparameterfv (NegativeTestContex
  
  void texparameterIiv (NegativeTestContext& ctx)
  {
 -      if (!contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)))
 +      if (!supportsES32orGL45(ctx))
                throw tcu::NotSupportedError("glTexParameterIiv is not supported.", DE_NULL, __FILE__, __LINE__);
  
-       GLint textureMode[] = { GL_DEPTH_COMPONENT, GL_STENCIL_INDEX };
+       GLint textureMode[] = { GL_DEPTH_COMPONENT, GL_STENCIL_INDEX, GL_INVALID_ENUM, GL_INVALID_ENUM };
        ctx.beginSection("GL_INVALID_ENUM is generated if target is not a valid target.");
        ctx.glTexParameterIiv(0, GL_DEPTH_STENCIL_TEXTURE_MODE, textureMode);
        ctx.expectError(GL_INVALID_ENUM);
@@@ -2359,10 -2338,10 +2359,10 @@@
  
  void texparameterIuiv (NegativeTestContext& ctx)
  {
 -      if (!contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)))
 +      if (!supportsES32orGL45(ctx))
                throw tcu::NotSupportedError("glTexParameterIuiv is not supported.", DE_NULL, __FILE__, __LINE__);
  
-       GLuint textureMode[] = { GL_DEPTH_COMPONENT, GL_STENCIL_INDEX };
+       GLuint textureMode[] = { GL_DEPTH_COMPONENT, GL_STENCIL_INDEX, GL_INVALID_ENUM, GL_INVALID_ENUM };
        ctx.beginSection("GL_INVALID_ENUM is generated if target is not a valid target.");
        ctx.glTexParameterIuiv(0, GL_DEPTH_STENCIL_TEXTURE_MODE, textureMode);
        ctx.expectError(GL_INVALID_ENUM);