diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2015-08-13 09:30:35 +0300 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2015-08-14 12:21:01 +0300 |
| commit | 7a144aaf64e5cfff5aa53d7fd340c91762e51aa5 (patch) | |
| tree | cfb874979fbb24132e72d19d3a6c0848b0bbce05 | |
| parent | 28ed1e08e8ba98ebd4ff0b56326372f0df9c73ad (diff) | |
mesa: set correct error for non-renderable multisample textures
v2: same common error on gles31 and desktop OpenGL
(spotted by Erik Faye-Lund)
Signed-off-by: Marta Lofstedt <marta.lofstedt@linux.intel.com>
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
| -rw-r--r-- | src/mesa/main/teximage.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index a144f950d4..3a556a6ad6 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -5639,9 +5639,16 @@ _mesa_texture_image_multisample(struct gl_context *ctx, GLuint dims, } if (!is_renderable_texture_format(ctx, internalformat)) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "%s(internalformat=%s)", - func, _mesa_enum_to_string(internalformat)); + /* Page 172 of OpenGL ES 3.1 spec says: + * "An INVALID_ENUM error is generated if sizedinternalformat is not + * color-renderable, depth-renderable, or stencil-renderable (as + * defined in section 9.4). + * + * (Same error is also defined for desktop OpenGL for multisample + * teximage/texstorage functions.) + */ + _mesa_error(ctx, GL_INVALID_ENUM, "%s(internalformat=%s)", func, + _mesa_enum_to_string(internalformat)); return; } |