fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: fix BlitFramebuffer between linear and sRGB formats

Browse source 
NOTE: This is a candidate for the stable branches.

Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 91ca053714)
This commit is contained in:
Marek Olšák 2012-11-23 03:02:44 +01:00
parent d0a9ab29b2
commit e1cb624a43
1 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/mesa/main/fbobject.c
View file

@ -2796,11 +2796,41 @@ get_nongeneric_internalformat(GLenum format)
}
static GLenum
get_linear_internalformat(GLenum format)
{
switch (format) {
case GL_SRGB:
return GL_RGB;
case GL_SRGB_ALPHA:
return GL_RGBA;
case GL_SRGB8:
return GL_RGB8;
case GL_SRGB8_ALPHA8:
return GL_RGBA8;
case GL_SLUMINANCE:
return GL_LUMINANCE8;
case GL_SLUMINANCE_ALPHA:
return GL_LUMINANCE8_ALPHA8;
default:
return format;
}
}
static GLboolean
compatible_resolve_formats(const struct gl_renderbuffer *colorReadRb,
const struct gl_renderbuffer *colorDrawRb)
{
/* The simple case where we know the backing formats are the same.
GLenum readFormat, drawFormat;
/* The simple case where we know the backing Mesa formats are the same.
*/
if (_mesa_get_srgb_format_linear(colorReadRb->Format) ==
_mesa_get_srgb_format_linear(colorDrawRb->Format)) {
@ -2814,9 +2844,15 @@ compatible_resolve_formats(const struct gl_renderbuffer *colorReadRb,
* textures and get two entirely different Mesa formats like RGBA8888 and
* ARGB8888. Drivers behaving like that should be able to cope with
* non-matching formats by themselves, because it's not the user's fault.
*
* Blits between linear and sRGB formats are also allowed.
*/
if (get_nongeneric_internalformat(colorReadRb->InternalFormat) ==
get_nongeneric_internalformat(colorDrawRb->InternalFormat)) {
readFormat = get_nongeneric_internalformat(colorReadRb->InternalFormat);
drawFormat = get_nongeneric_internalformat(colorDrawRb->InternalFormat);
readFormat = get_linear_internalformat(readFormat);
drawFormat = get_linear_internalformat(drawFormat);
if (readFormat == drawFormat) {
return GL_TRUE;
}