From 36ebe43247b45ca9933ccc511c73c373a4fafe59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Fri, 24 Oct 2014 17:03:56 -0700 Subject: [PATCH] Use invalid sample count in renderbuffer_storage_multisample negative case. Bug; 18100655 Change-Id: I9bd0417c44f3531755ec2ba1cc06f8164df50661 --- modules/gles31/functional/es31fNegativeBufferApiTests.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp index 3c9e27b..9f63623 100644 --- a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp +++ b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp @@ -1396,8 +1396,11 @@ void renderbuffer_storage_multisample (NegativeTestContext& ctx) { deUint32 rbo = 0x1234; int maxSamplesSupportedRGBA4 = -1; + int maxSamplesSupportedRGBA8UI = -1; ctx.glGetInternalformativ (GL_RENDERBUFFER, GL_RGBA4, GL_SAMPLES, 1, &maxSamplesSupportedRGBA4); + ctx.glGetInternalformativ (GL_RENDERBUFFER, GL_RGBA8UI, GL_SAMPLES, 1, &maxSamplesSupportedRGBA8UI); + ctx.glGenRenderbuffers (1, &rbo); ctx.glBindRenderbuffer (GL_RENDERBUFFER, rbo); @@ -1427,8 +1430,8 @@ void renderbuffer_storage_multisample (NegativeTestContext& ctx) ctx.expectError (GL_INVALID_ENUM); ctx.endSection(); - ctx.beginSection("GL_INVALID_OPERATION is generated if internalformat is a signed or unsigned integer format and samples is greater than 0."); - ctx.glRenderbufferStorageMultisample (GL_RENDERBUFFER, 1, GL_RGBA8UI, 1, 1); + ctx.beginSection("GL_INVALID_OPERATION is generated if samples is greater than the maximum number of samples supported for internalformat. (Unsigned integer format)"); + ctx.glRenderbufferStorageMultisample (GL_RENDERBUFFER, maxSamplesSupportedRGBA8UI+1, GL_RGBA8UI, 1, 1); ctx.expectError (GL_INVALID_OPERATION); ctx.endSection(); -- 2.7.4