From 19252fee46b835cb4f6b1cce18d7737d62b64a2e Mon Sep 17 00:00:00 2001 From: Eduardo Lima Mitev Date: Mon, 15 Dec 2014 11:30:21 +0100 Subject: [PATCH] mesa: Adds check for integer internal format and num samples in glRenderbufferStorageMultisample Per GLES3 specification, section 4.4 Framebuffer objects page 198, "If internalformat is a signed or unsigned integer format and samples is greater than zero, then the error INVALID_OPERATION is generated.". Fixes 1 dEQP test: * dEQP-GLES3.functional.negative_api.buffer.renderbuffer_storage_multisample Reviewed-by: Matt Turner --- src/mesa/main/multisample.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c index 1f3fa0c1562..b696de9f239 100644 --- a/src/mesa/main/multisample.c +++ b/src/mesa/main/multisample.c @@ -150,6 +150,16 @@ GLenum _mesa_check_sample_count(struct gl_context *ctx, GLenum target, GLenum internalFormat, GLsizei samples) { + /* Section 4.4 (Framebuffer objects) of the OpenGL 3.0 specification says: + * + * "If internalformat is a signed or unsigned integer format and samples + * is greater than zero, then the error INVALID_OPERATION is generated." + */ + if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalFormat)) { + return GL_INVALID_OPERATION; + } + + /* If ARB_internalformat_query is supported, then treat its highest * returned sample count as the absolute maximum for this format; it is * allowed to exceed MAX_SAMPLES. -- 2.30.2