From 1c080cd9b5477ac2e405e47a007699e088b8c49d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Thu, 29 Aug 2019 00:12:52 +0200 Subject: [PATCH] Use GL_MAX_3D_TEXTURE_SIZE_OES when testing textures 3D Components: OpenGL-ES VK-GL-CTS issue: 1962 Affects: KHR-GLES2.texture_3d.compressed_texture.negative_compressed_tex_image KHR-GLES2.texture_3d.framebuffer_texture.negative Change-Id: I1b721755da9fd02cd47d1abce670bc788abf8f61 --- external/openglcts/modules/gles2/es2cTexture3DTests.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/external/openglcts/modules/gles2/es2cTexture3DTests.cpp b/external/openglcts/modules/gles2/es2cTexture3DTests.cpp index 0560212..b9cc9f3 100644 --- a/external/openglcts/modules/gles2/es2cTexture3DTests.cpp +++ b/external/openglcts/modules/gles2/es2cTexture3DTests.cpp @@ -1574,7 +1574,7 @@ NegativeFramebufferTexture3DCase::IterateResult NegativeFramebufferTexture3DCase gl.bindTexture(GL_TEXTURE_3D, tex3D); GLint maxTexSize = 0x1234; - gl.getIntegerv(GL_MAX_TEXTURE_SIZE, &maxTexSize); + gl.getIntegerv(GL_MAX_3D_TEXTURE_SIZE_OES, &maxTexSize); gl.getError(); // reset error callFramebufferTexture3D(-1, GL_COLOR_ATTACHMENT0, GL_TEXTURE_3D, tex3D, 0, 0); @@ -1695,11 +1695,11 @@ NegativeCompressedTexImage3DCase::IterateResult NegativeCompressedTexImage3DCase // maximal dimensions { int maxTextureSize; - gl.getIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize); + gl.getIntegerv(GL_MAX_3D_TEXTURE_SIZE_OES, &maxTextureSize); ++maxTextureSize; const char* message = - "GL_INVALID_VALUE is generated if width, height or depth is greater than GL_MAX_TEXTURE_SIZE."; + "GL_INVALID_VALUE is generated if width, height or depth is greater than GL_MAX_3D_TEXTURE_SIZE_OES."; callCompressedTexImage3D(GL_TEXTURE_3D, 0, supportedCompressedFormat, maxTextureSize, 0, 0, 0, 0, 0); verifyError(GL_INVALID_VALUE, message); callCompressedTexImage3D(GL_TEXTURE_3D, 0, supportedCompressedFormat, 0, maxTextureSize, 0, 0, 0, 0); -- 2.7.4