diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2016-03-08 20:00:06 -0800 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-03-10 11:23:52 -0800 |
commit | 9ea00c6f6b2924befe41f6ef55244e6aa20c702a (patch) | |
tree | 9448fda5e8b42b3cfb9b74065187c351194cab56 /src/mesa/drivers/dri/i965/intel_fbo.c | |
parent | e032e4ad5a3f73dffb1a8babcfd333954a574ffa (diff) | |
download | external_mesa3d-9ea00c6f6b2924befe41f6ef55244e6aa20c702a.zip external_mesa3d-9ea00c6f6b2924befe41f6ef55244e6aa20c702a.tar.gz external_mesa3d-9ea00c6f6b2924befe41f6ef55244e6aa20c702a.tar.bz2 |
i965: Set a proper _BaseFormat for window system renderbuffers in ES.
intel_alloc_private_renderbuffer_storage did:
rb->_BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);
Unfortunately, internalFormat was usually an unsized format (such as
GL_DEPTH_COMPONENT). In OpenGL ES, _mesa_base_fbo_format() refuses to
accept unsized formats, and returns 0 rather than a real base format.
This meant that we ended up with a completely bogus rb->_BaseFormat for
window system buffers on OpenGL ES. All other renderbuffer allocation
functions in intel_fbo.c instead use the mesa_format, and do:
rb->_BaseFormat = _mesa_get_format_base_format(...);
We can do likewise, using rb->Format. This appears to work just fine.
dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_x_size_initial
failed, as it tried to perform a GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE query
on the window system depth buffer. That query relies on a proper
rb->_BaseFormat being set, so it broke because rb->_BaseFormat was 0 due
to the above bug.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94458
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_fbo.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_fbo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 3a4a53a..b7b6796 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -289,7 +289,7 @@ intel_alloc_private_renderbuffer_storage(struct gl_context * ctx, struct gl_rend rb->NumSamples = intel_quantize_num_samples(screen, rb->NumSamples); rb->Width = width; rb->Height = height; - rb->_BaseFormat = _mesa_base_fbo_format(ctx, internalFormat); + rb->_BaseFormat = _mesa_get_format_base_format(rb->Format); intel_miptree_release(&irb->mt); |