diff options
| author | Timothy Arceri <t_arceri@yahoo.com.au> | 2015-08-13 18:44:51 +1000 |
|---|---|---|
| committer | Timothy Arceri <t_arceri@yahoo.com.au> | 2015-08-18 07:07:57 +1000 |
| commit | 46684d3ae3a4084b00355df3feeeb25159656a8e (patch) | |
| tree | b75fe0472aecbdd6ce0935f73db52999716e19ab | |
| parent | d3ace603a97bdd031bdff7517728eff4d0fd6458 (diff) | |
| download | external_mesa3d-46684d3ae3a4084b00355df3feeeb25159656a8e.zip external_mesa3d-46684d3ae3a4084b00355df3feeeb25159656a8e.tar.gz external_mesa3d-46684d3ae3a4084b00355df3feeeb25159656a8e.tar.bz2 | |
mesa: move non-generic samples validation
The previous patch replaces the other use case.
V2: remove the validation from it old location.
Cc: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
| -rw-r--r-- | src/mesa/main/fbobject.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/multisample.c | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 8418340..07db195 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -2033,6 +2033,16 @@ renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, */ sample_count_error = _mesa_check_sample_count(ctx, GL_RENDERBUFFER, internalFormat, samples); + + /* Section 2.5 (GL Errors) of OpenGL 3.0 specification, page 16: + * + * "If a negative number is provided where an argument of type sizei or + * sizeiptr is specified, the error INVALID VALUE is generated." + */ + if (samples < 0) { + sample_count_error = GL_INVALID_VALUE; + } + if (sample_count_error != GL_NO_ERROR) { _mesa_error(ctx, sample_count_error, "%s(samples)", func); return; diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c index 09e6154..e7783ea 100644 --- a/src/mesa/main/multisample.c +++ b/src/mesa/main/multisample.c @@ -150,15 +150,6 @@ GLenum _mesa_check_sample_count(struct gl_context *ctx, GLenum target, GLenum internalFormat, GLsizei samples) { - /* Section 2.5 (GL Errors) of OpenGL 3.0 specification, page 16: - * - * "If a negative number is provided where an argument of type sizei or - * sizeiptr is specified, the error INVALID VALUE is generated." - */ - if (samples < 0) { - return GL_INVALID_VALUE; - } - /* Section 4.4 (Framebuffer objects), page 198 of the OpenGL ES 3.0.0 * specification says: * |