diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2017-02-23 15:04:52 -0800 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2017-04-04 17:35:18 -0700 |
commit | c5bf7cb52942cb7df9f5d73746ffbf3c102d12cc (patch) | |
tree | 2d3bd59321d51fae3cf73531e9a092a43192b48f /src | |
parent | c161a104629ad49dc6a4f7d1fe82e87fc08121fe (diff) |
mesa: Require mipmap completeness for glCopyImageSubData(), sometimes.
This patch makes glCopyImageSubData require mipmap completeness when the
texture object's built-in sampler object has a mipmapping MinFilter.
Fixes (on i965):
dEQP-GLES31.functional.debug.negative_coverage.*.buffer.copy_image_sub_data
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/main/copyimage.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c index cf25159e880..877c8ac246d 100644 --- a/src/mesa/main/copyimage.c +++ b/src/mesa/main/copyimage.c @@ -149,9 +149,30 @@ prepare_target(struct gl_context *ctx, GLuint name, GLenum target, return false; } + /* The ARB_copy_image specification says: + * + * "INVALID_OPERATION is generated if either object is a texture and + * the texture is not complete (as defined in section 3.9.14)" + * + * The cited section says: + * + * "Using the preceding definitions, a texture is complete unless any + * of the following conditions hold true: [...] + * + * * The minification filter requires a mipmap (is neither NEAREST + * nor LINEAR), and the texture is not mipmap complete." + * + * This imposes the bizarre restriction that glCopyImageSubData requires + * mipmap completion at times, which dEQP mandates, and other drivers + * appear to implement. We don't have any texture units here, so we + * can't look at any bound separate sampler objects...it appears that + * you're supposed to use the sampler object which is built-in to the + * texture object. + * + * See https://cvs.khronos.org/bugzilla/show_bug.cgi?id=16224. + */ _mesa_test_texobj_completeness(ctx, texObj); - if (!texObj->_BaseComplete || - (level != 0 && !texObj->_MipmapComplete)) { + if (!_mesa_is_texture_complete(texObj, &texObj->Sampler)) { _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyImageSubData(%sName incomplete)", dbg_prefix); return false; |