Attachment 73720 Details for Bug 55396 – Also match sRGB formats in _mesa_format_matches_format_and_type().

[patch] Also match sRGB formats in _mesa_format_matches_format_and_type().

patch.diff (text/plain), 2.48 KB, created by Henri Verbeet on 2013-01-27 09:32:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henri Verbeet

Created: 2013-01-27 09:32:46 UTC

Size: 2.48 KB

patch

obsolete

>diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
>index 47a1d68..7322c91 100644
>--- a/src/mesa/main/formats.c
>+++ b/src/mesa/main/formats.c
>@@ -2680,6 +2680,7 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
>       return GL_FALSE;
> 
>    case MESA_FORMAT_RGBA8888:
>+   case MESA_FORMAT_SRGBA8:
>       if (format == GL_RGBA && type == GL_UNSIGNED_INT_8_8_8_8 && !swapBytes)
>          return GL_TRUE;
> 
>@@ -2727,6 +2728,7 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
>       return GL_FALSE;
> 
>    case MESA_FORMAT_ARGB8888:
>+   case MESA_FORMAT_SARGB8:
>       if (format == GL_BGRA && type == GL_UNSIGNED_INT_8_8_8_8_REV &&
>           !swapBytes)
>          return GL_TRUE;
>@@ -2761,6 +2763,7 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
>       return GL_FALSE;
> 
>    case MESA_FORMAT_RGB888:
>+   case MESA_FORMAT_SRGB8:
>       return format == GL_BGR && type == GL_UNSIGNED_BYTE && littleEndian;
> 
>    case MESA_FORMAT_BGR888:
>@@ -2799,6 +2802,7 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
>    case MESA_FORMAT_AL88:
>       return format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE && littleEndian;
>    case MESA_FORMAT_AL88_REV:
>+   case MESA_FORMAT_SLA8:
>       return GL_FALSE;
> 
>    case MESA_FORMAT_AL1616:
>@@ -2815,6 +2819,7 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
>       return format == GL_ALPHA && type == GL_UNSIGNED_SHORT &&
>          littleEndian && !swapBytes;
>    case MESA_FORMAT_L8:
>+   case MESA_FORMAT_SL8:
>       return format == GL_LUMINANCE && type == GL_UNSIGNED_BYTE;
>    case MESA_FORMAT_L16:
>       return format == GL_LUMINANCE && type == GL_UNSIGNED_SHORT &&
>@@ -2870,23 +2875,16 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
>    case MESA_FORMAT_S8:
>       return format == GL_STENCIL_INDEX && type == GL_UNSIGNED_BYTE;
> 
>-   case MESA_FORMAT_SRGB8:
>-   case MESA_FORMAT_SRGBA8:
>-   case MESA_FORMAT_SARGB8:
>-   case MESA_FORMAT_SL8:
>-   case MESA_FORMAT_SLA8:
>-   case MESA_FORMAT_SRGB_DXT1:
>-   case MESA_FORMAT_SRGBA_DXT1:
>-   case MESA_FORMAT_SRGBA_DXT3:
>-   case MESA_FORMAT_SRGBA_DXT5:
>-      return GL_FALSE;
>-
>    case MESA_FORMAT_RGB_FXT1:
>    case MESA_FORMAT_RGBA_FXT1:
>    case MESA_FORMAT_RGB_DXT1:
>    case MESA_FORMAT_RGBA_DXT1:
>    case MESA_FORMAT_RGBA_DXT3:
>    case MESA_FORMAT_RGBA_DXT5:
>+   case MESA_FORMAT_SRGB_DXT1:
>+   case MESA_FORMAT_SRGBA_DXT1:
>+   case MESA_FORMAT_SRGBA_DXT3:
>+   case MESA_FORMAT_SRGBA_DXT5:
>       return GL_FALSE;
> 
>    case MESA_FORMAT_RGBA_FLOAT32:

Actions: View | Splinter Review

Attachments on bug 55396: 68991 | 68992 | 69388 | 70313 | 73719 | 73720 | 74338

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.