From 0a6e726bfbb6f57a16fd729210e7ce22403f03ba Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Apr 2021 15:36:51 -0400 Subject: [PATCH] mesa: gl_config::rgbBits should count alphaBits too This backs {EGL,GLX}_BUFFER_SIZE, which explicitly include alpha. Acked-By: Mike Blumenkrantz Part-of: --- src/mesa/main/context.c | 2 +- src/mesa/main/framebuffer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 4a8e76e0ce1..b6539f5a4f0 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -280,7 +280,7 @@ _mesa_initialize_visual( struct gl_config *vis, vis->greenBits = greenBits; vis->blueBits = blueBits; vis->alphaBits = alphaBits; - vis->rgbBits = redBits + greenBits + blueBits; + vis->rgbBits = redBits + greenBits + blueBits + alphaBits; vis->depthBits = depthBits; vis->stencilBits = stencilBits; diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c index 0917c33df55..a5460795b88 100644 --- a/src/mesa/main/framebuffer.c +++ b/src/mesa/main/framebuffer.c @@ -436,8 +436,8 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx, fb->Visual.greenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS); fb->Visual.blueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS); fb->Visual.alphaBits = _mesa_get_format_bits(fmt, GL_ALPHA_BITS); - fb->Visual.rgbBits = fb->Visual.redBits - + fb->Visual.greenBits + fb->Visual.blueBits; + fb->Visual.rgbBits = fb->Visual.redBits + fb->Visual.greenBits + + fb->Visual.blueBits + fb->Visual.alphaBits; if (_mesa_is_format_srgb(fmt)) fb->Visual.sRGBCapable = ctx->Extensions.EXT_sRGB; break;