diff options
| author | Marta Lofstedt <[email protected]> | 2015-06-15 13:50:21 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2015-08-10 13:34:49 +0300 |
| commit | b6d014f0ba010f0e61be43abdceb5f2201028a04 (patch) | |
| tree | bbe2d16898225f6cae212985e88dc702387b5568 /src | |
| parent | 2ac171a7db4e4ad2fa902e62bf18bc1f67e91643 (diff) | |
mesa/es3.1: Pass sample count check for multisampled textures
v3 : Removed space in comment.
Signed-off-by: Marta Lofstedt <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/multisample.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c index 490bad507c3..09e6154f7ec 100644 --- a/src/mesa/main/multisample.c +++ b/src/mesa/main/multisample.c @@ -164,8 +164,11 @@ _mesa_check_sample_count(struct gl_context *ctx, GLenum target, * * "If internalformat is a signed or unsigned integer format and samples * is greater than zero, then the error INVALID_OPERATION is generated." + * + * This restriction is relaxed for OpenGL ES 3.1. */ - if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalFormat) + if ((ctx->API == API_OPENGLES2 && ctx->Version == 30) && + _mesa_is_enum_format_integer(internalFormat) && samples > 0) { return GL_INVALID_OPERATION; } |