From: Piers Daniell <pdaniell@nvidia.com>
Date: Mon, 23 Mar 2020 22:43:24 +0000 (-0600)
Subject: Fix expected errors for some DSA functions
X-Git-Tag: upstream/1.3.5~852^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03c16305943cf98bbe1d55aaca7666d796c1398c;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix expected errors for some DSA functions

The OpenGL spec was fixed recently to correct some errors
for some DSA functions in
https://github.com/KhronosGroup/OpenGL-Registry/pull/300

This CL updates the CTS to match.

Affects:

KHR-GL46.direct_state_access.textures_buffer_errors
KHR-GL46.direct_state_access.textures_buffer_range_errors
KHR-GL46.direct_state_access.textures_parameter_setup_errors

Components: OpenGL

VK-GL-CTS issue: 2275

Change-Id: I783c4ca1924cbf6aa3af82d7ac5f49db4a94978b
---

diff --git a/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp b/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp
index 6bc7fe2..c18b666 100644
--- a/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp
+++ b/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp
@@ -8622,7 +8622,7 @@ tcu::TestNode::IterateResult BufferErrorsTest::iterate()
 		{
 			gl.textureBuffer(texture_1D, GL_RGBA8, buffer);
 
-			is_ok &= CheckErrorAndLog(m_context, GL_INVALID_ENUM, "glTextureBuffer",
+			is_ok &= CheckErrorAndLog(m_context, GL_INVALID_OPERATION, "glTextureBuffer",
 									  "the effective target of texture is not TEXTURE_BUFFER.");
 		}
 
@@ -8775,7 +8775,7 @@ tcu::TestNode::IterateResult BufferRangeErrorsTest::iterate()
 		{
 			gl.textureBufferRange(texture_1D, GL_RGBA8, buffer, 0, data_size);
 
-			is_ok &= CheckErrorAndLog(m_context, GL_INVALID_ENUM, "glTextureBufferRange",
+			is_ok &= CheckErrorAndLog(m_context, GL_INVALID_OPERATION, "glTextureBufferRange",
 									  "the effective target of texture is not TEXTURE_BUFFER.");
 		}
 
@@ -12138,7 +12138,7 @@ bool ParameterSetupErrorsTest::Testf()
 	{
 		gl.textureParameterf(m_to_2D_ms, GL_TEXTURE_LOD_BIAS, 1.f);
 
-		is_ok &= CheckErrorAndLog(m_context, GL_INVALID_ENUM, "glTextureParameterf",
+		is_ok &= CheckErrorAndLog(m_context, GL_INVALID_OPERATION, "glTextureParameterf",
 								  "the  effective target is either TEXTURE_2D_MULTISAMPLE or  "
 								  "TEXTURE_2D_MULTISAMPLE_ARRAY, and pname is any of the sampler states.");
 	}
@@ -12266,7 +12266,7 @@ bool ParameterSetupErrorsTest::Testi()
 	{
 		gl.textureParameteri(m_to_2D_ms, GL_TEXTURE_LOD_BIAS, 1);
 
-		is_ok &= CheckErrorAndLog(m_context, GL_INVALID_ENUM, "glTextureParameteri",
+		is_ok &= CheckErrorAndLog(m_context, GL_INVALID_OPERATION, "glTextureParameteri",
 								  "the  effective target is either TEXTURE_2D_MULTISAMPLE or  "
 								  "TEXTURE_2D_MULTISAMPLE_ARRAY, and pname is any of the sampler states.");
 	}
@@ -12390,7 +12390,7 @@ bool ParameterSetupErrorsTest::Testfv()
 	{
 		gl.textureParameterfv(m_to_2D_ms, GL_TEXTURE_LOD_BIAS, &one);
 
-		is_ok &= CheckErrorAndLog(m_context, GL_INVALID_ENUM, "glTextureParameterfv",
+		is_ok &= CheckErrorAndLog(m_context, GL_INVALID_OPERATION, "glTextureParameterfv",
 								  "the  effective target is either TEXTURE_2D_MULTISAMPLE or  "
 								  "TEXTURE_2D_MULTISAMPLE_ARRAY, and pname is any of the sampler states.");
 	}
@@ -12514,7 +12514,7 @@ bool ParameterSetupErrorsTest::Testiv()
 	{
 		gl.textureParameteriv(m_to_2D_ms, GL_TEXTURE_LOD_BIAS, &one);
 
-		is_ok &= CheckErrorAndLog(m_context, GL_INVALID_ENUM, "glTextureParameteriv",
+		is_ok &= CheckErrorAndLog(m_context, GL_INVALID_OPERATION, "glTextureParameteriv",
 								  "the  effective target is either TEXTURE_2D_MULTISAMPLE or  "
 								  "TEXTURE_2D_MULTISAMPLE_ARRAY, and pname is any of the sampler states.");
 	}