From 35444a6c990528a80cda3e3edea33369e688541e Mon Sep 17 00:00:00 2001 From: James Helferty Date: Tue, 1 Aug 2017 15:48:58 -0400 Subject: [PATCH] Update GetTextureImage test for revised DSA error As of GL 4.6, GetTextureImage (and other related DSA entry points) generate INVALID_OPERATION instead of INVALID_ENUM if a texture argument does not have the accepted texture target type. VK-GL-CTS issue: 610 Components: OpenGL Affects: KHR-GL45.direct_state_access.textures_image_query_errors Change-Id: I6252599a86cd84b5946cb2e3d34d2ceb56199a05 --- external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp b/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp index 81fa878..d577144 100644 --- a/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp +++ b/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp @@ -12661,12 +12661,12 @@ tcu::TestNode::IterateResult ImageQueryErrorsTest::iterate() /* Tests. */ - /* Check that INVALID_ENUM is generated by GetTextureImage functions if + /* Check that INVALID_OPERATION is generated by GetTextureImage functions if resulting texture target is not an accepted value TEXTURE_1D, TEXTURE_2D, TEXTURE_3D, TEXTURE_1D_ARRAY, TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY, TEXTURE_RECTANGLE, and TEXTURE_CUBE_MAP. */ gl.getTextureImage(texture_2D_ms, 0, s_reference_format, s_reference_type, s_reference_size, store); - is_ok &= CheckErrorAndLog(m_context, GL_INVALID_ENUM, "glGetTextureImage", + is_ok &= CheckErrorAndLog(m_context, GL_INVALID_OPERATION, "glGetTextureImage", "resulting texture target is not an accepted value TEXTURE_1D, TEXTURE_2D, " "TEXTURE_3D, TEXTURE_1D_ARRAY, TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY, " "TEXTURE_RECTANGLE, and TEXTURE_CUBE_MAP."); -- 2.7.4