diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-02-17 20:31:38 -0500 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-02-19 11:30:33 -0500 |
| commit | 68c4af1c1942d30665f3f99654e8f35b175d1256 (patch) | |
| tree | a50d34091f31e3c616b40e214c866638827b5aca /src/mesa/main/fbobject.c | |
| parent | 0eb7b5c2a3f17d64e85247c1f4907ce20bc57a73 (diff) | |
| download | external_mesa3d-68c4af1c1942d30665f3f99654e8f35b175d1256.zip external_mesa3d-68c4af1c1942d30665f3f99654e8f35b175d1256.tar.gz external_mesa3d-68c4af1c1942d30665f3f99654e8f35b175d1256.tar.bz2 | |
mesa: check fbo completeness based on internal format, not driver format
The base format is a function of the user-requested format, while the
driver format is not. So we should use the base format instead.
The driver format can be anything. Specifically in the stencil-only
case, it might be a depth/stencil format. However we still want to
refuse such an attachment when bound to GL_DEPTH.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/fbobject.c')
| -rw-r--r-- | src/mesa/main/fbobject.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 1b9b692..1f10050 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -811,7 +811,7 @@ test_attachment_completeness(const struct gl_context *ctx, GLenum format, break; } - baseFormat = _mesa_get_format_base_format(texImage->TexFormat); + baseFormat = texImage->_BaseFormat; if (format == GL_COLOR) { if (!_mesa_is_legal_color_format(ctx, baseFormat)) { @@ -868,8 +868,7 @@ test_attachment_completeness(const struct gl_context *ctx, GLenum format, } } else if (att->Type == GL_RENDERBUFFER_EXT) { - const GLenum baseFormat = - _mesa_get_format_base_format(att->Renderbuffer->Format); + const GLenum baseFormat = att->Renderbuffer->_BaseFormat; assert(att->Renderbuffer); if (!att->Renderbuffer->InternalFormat || |