KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Handle pbuffers in desktop GL framebuffer attachment queries 

Once again, we were handling back-to-front in the GLES3 case, but not
the desktop GL case.

Fixes GTF-GL46.gtf30.GL3Tests.framebuffer_srgb.framebuffer_srgb_default_encoding when run with --deqp-surface-type=pbuffer --deqp-gl-context-type=egl.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Kenneth Graunke 2019-10-14 10:07:30 -07:00
parent c512eca4da
commit e6ca6e587e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/main/fbobject.c
View File

@ -326,22 +326,24 @@ get_fb0_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
{
assert(_mesa_is_winsys_fbo(fb));
attachment = _mesa_back_to_front_if_single_buffered(fb, attachment);
if (_mesa_is_gles3(ctx)) {
assert(attachment == GL_BACK ||
attachment == GL_DEPTH ||
attachment == GL_STENCIL);
switch (attachment) {
case GL_BACK:
/* Since there is no stereo rendering in ES 3.0, only return the
* LEFT bits.
*/
if (ctx->DrawBuffer->Visual.doubleBufferMode)
return &fb->Attachment[BUFFER_BACK_LEFT];
return &fb->Attachment[BUFFER_BACK_LEFT];
case GL_FRONT:
/* We might get this if back_to_front triggers above */
return &fb->Attachment[BUFFER_FRONT_LEFT];
case GL_DEPTH:
return &fb->Attachment[BUFFER_DEPTH];
case GL_STENCIL:
return &fb->Attachment[BUFFER_STENCIL];
default:
unreachable("invalid attachment");
}
}