Attachment 113719 Details for Bug 89148 – workaround

[patch] workaround

0001-r300g-handle-sRGB-formats-in-r300_translate_colormas.patch (text/plain), 1.93 KB, created by Marek Olšák on 2015-02-21 11:06:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Olšák

Created: 2015-02-21 11:06:40 UTC

Size: 1.93 KB

patch

obsolete

>From 84c960b7861cd99e8e635b8e811553451b86f3fb Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
>Date: Sat, 21 Feb 2015 12:02:22 +0100
>Subject: [PATCH] r300g: handle sRGB formats in
> r300_translate_colormask_swizzle
>
>sRGB colorbuffers are unsupported, but this should prevent crashes
>in r300_emit_blend_state.
>
>Cc: 10.5 10.4 <mesa-stable@lists.freedesktop.org>
>---
> src/gallium/drivers/r300/r300_texture.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
>index ffe8c00..c5b4805 100644
>--- a/src/gallium/drivers/r300/r300_texture.c
>+++ b/src/gallium/drivers/r300/r300_texture.c
>@@ -773,6 +773,7 @@ static uint32_t r300_translate_colormask_swizzle(enum pipe_format format)
>     case PIPE_FORMAT_B5G5R5X1_UNORM:
>     case PIPE_FORMAT_B4G4R4X4_UNORM:
>     case PIPE_FORMAT_B8G8R8X8_UNORM:
>+    case PIPE_FORMAT_B8G8R8X8_SRGB:
>     /*case PIPE_FORMAT_B8G8R8X8_SNORM:*/
>     case PIPE_FORMAT_B10G10R10X2_UNORM:
>         return COLORMASK_BGRX;
>@@ -781,11 +782,13 @@ static uint32_t r300_translate_colormask_swizzle(enum pipe_format format)
>     case PIPE_FORMAT_B5G5R5A1_UNORM:
>     case PIPE_FORMAT_B4G4R4A4_UNORM:
>     case PIPE_FORMAT_B8G8R8A8_UNORM:
>+    case PIPE_FORMAT_B8G8R8A8_SRGB:
>     /*case PIPE_FORMAT_B8G8R8A8_SNORM:*/
>     case PIPE_FORMAT_B10G10R10A2_UNORM:
>         return COLORMASK_BGRA;
> 
>     case PIPE_FORMAT_R8G8B8X8_UNORM:
>+    case PIPE_FORMAT_R8G8B8X8_SRGB:
>     /* RGBX_SNORM formats are broken for an unknown reason */
>     /*case PIPE_FORMAT_R8G8B8X8_SNORM:*/
>     /*case PIPE_FORMAT_R10G10B10X2_SNORM:*/
>@@ -796,6 +799,7 @@ static uint32_t r300_translate_colormask_swizzle(enum pipe_format format)
>         return COLORMASK_RGBX;
> 
>     case PIPE_FORMAT_R8G8B8A8_UNORM:
>+    case PIPE_FORMAT_R8G8B8A8_SRGB:
>     case PIPE_FORMAT_R8G8B8A8_SNORM:
>     case PIPE_FORMAT_R10G10B10A2_UNORM:
>     case PIPE_FORMAT_R16_UNORM:
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 89148: 113562 | 113620 | 113719 | 113802

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.