diff options
| author | Eduardo Lima Mitev <[email protected]> | 2014-12-15 11:30:21 +0100 |
|---|---|---|
| committer | Samuel Iglesias Gonsalvez <[email protected]> | 2015-02-19 09:35:41 +0100 |
| commit | 19252fee46b835cb4f6b1cce18d7737d62b64a2e (patch) | |
| tree | 2ca3cfb7015e64f30b1b646b5182d0d7621f16f4 | |
| parent | dbc160a3f8a6be26110656a15c0d6048391f4fc7 (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/mesa/main/multisample.c | 10 |
1 files changed, 10 insertions, 0 deletions
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. |