From 913c562932b8d3601ea4bd3eb4183e600ac7254d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=20Isoj=C3=A4rvi?= Date: Thu, 10 Mar 2016 15:59:29 -0800 Subject: [PATCH] Remove invalid duplicate checks for negative texture level Bug: 27126464 Change-Id: I2565e87011aef1576f5ab9727b11160a4f86c73f --- .../functional/es31fNegativeTextureApiTests.cpp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/modules/gles31/functional/es31fNegativeTextureApiTests.cpp b/modules/gles31/functional/es31fNegativeTextureApiTests.cpp index 968d0d7..6bd58e6 100644 --- a/modules/gles31/functional/es31fNegativeTextureApiTests.cpp +++ b/modules/gles31/functional/es31fNegativeTextureApiTests.cpp @@ -1856,15 +1856,11 @@ void texparameteri (NegativeTestContext& ctx) ctx.endSection(); ctx.beginSection("GL_INVALID_OPERATION is generated if target is GL_TEXTURE_2D_MULTISAMPLE or GL_TEXTURE_2D_MULTISAMPLE_ARRAY and pname GL_TEXTURE_BASE_LEVEL is not 0."); - ctx.glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BASE_LEVEL, -1); - ctx.expectError(GL_INVALID_OPERATION); ctx.glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BASE_LEVEL, 1); ctx.expectError(GL_INVALID_OPERATION); if (contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)) || ctx.getContextInfo().isExtensionSupported("GL_OES_texture_storage_multisample_2d_array")) { - ctx.glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BASE_LEVEL, -1); - ctx.expectError(GL_INVALID_OPERATION); ctx.glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BASE_LEVEL, 1); ctx.expectError(GL_INVALID_OPERATION); } @@ -1981,15 +1977,11 @@ void texparameterf (NegativeTestContext& ctx) ctx.endSection(); ctx.beginSection("GL_INVALID_OPERATION is generated if target is GL_TEXTURE_2D_MULTISAMPLE or GL_TEXTURE_2D_MULTISAMPLE_ARRAY and pname GL_TEXTURE_BASE_LEVEL is not 0."); - ctx.glTexParameterf(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BASE_LEVEL, -1.0f); - ctx.expectError(GL_INVALID_OPERATION); ctx.glTexParameterf(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BASE_LEVEL, 1.0f); ctx.expectError(GL_INVALID_OPERATION); if (contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)) || ctx.getContextInfo().isExtensionSupported("GL_OES_texture_storage_multisample_2d_array")) { - ctx.glTexParameterf(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BASE_LEVEL, -1.0f); - ctx.expectError(GL_INVALID_OPERATION); ctx.glTexParameterf(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BASE_LEVEL, 1.0f); ctx.expectError(GL_INVALID_OPERATION); } @@ -2099,18 +2091,12 @@ void texparameteriv (NegativeTestContext& ctx) ctx.endSection(); ctx.beginSection("GL_INVALID_OPERATION is generated if target is GL_TEXTURE_2D_MULTISAMPLE or GL_TEXTURE_2D_MULTISAMPLE_ARRAY and pname GL_TEXTURE_BASE_LEVEL is not 0."); - params[0] = -1; - ctx.glTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BASE_LEVEL, ¶ms[0]); - ctx.expectError(GL_INVALID_OPERATION); params[0] = 1; ctx.glTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BASE_LEVEL, ¶ms[0]); ctx.expectError(GL_INVALID_OPERATION); if (contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)) || ctx.getContextInfo().isExtensionSupported("GL_OES_texture_storage_multisample_2d_array")) { - params[0] = -1; - ctx.glTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BASE_LEVEL, ¶ms[0]); - ctx.expectError(GL_INVALID_OPERATION); params[0] = 1; ctx.glTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BASE_LEVEL, ¶ms[0]); ctx.expectError(GL_INVALID_OPERATION); @@ -2222,18 +2208,12 @@ void texparameterfv (NegativeTestContext& ctx) ctx.endSection(); ctx.beginSection("GL_INVALID_OPERATION is generated if target is GL_TEXTURE_2D_MULTISAMPLE or GL_TEXTURE_2D_MULTISAMPLE_ARRAY and pname GL_TEXTURE_BASE_LEVEL is not 0."); - params[0] = -1.0f; - ctx.glTexParameterfv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BASE_LEVEL, ¶ms[0]); - ctx.expectError(GL_INVALID_OPERATION); params[0] = 1.0f; ctx.glTexParameterfv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BASE_LEVEL, ¶ms[0]); ctx.expectError(GL_INVALID_OPERATION); if (contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)) || ctx.getContextInfo().isExtensionSupported("GL_OES_texture_storage_multisample_2d_array")) { - params[0] = -1.0f; - ctx.glTexParameterfv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BASE_LEVEL, ¶ms[0]); - ctx.expectError(GL_INVALID_OPERATION); params[0] = 1.0f; ctx.glTexParameterfv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BASE_LEVEL, ¶ms[0]); ctx.expectError(GL_INVALID_OPERATION); -- 2.7.4