Attachment 67360 Details for Bug 53972 – Patch to fix the problem

[patch] Patch to fix the problem

0001-i965-Add-support-for-GL_SKIP_DECODE_EXT-on-other-SRG.patch (text/plain), 1.87 KB, created by Matt Turner on 2012-09-19 01:55:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Turner

Created: 2012-09-19 01:55:45 UTC

Size: 1.87 KB

patch

obsolete

>From 83d13bde7ae4231cfae81c92c08167d8dcfc2e75 Mon Sep 17 00:00:00 2001
>From: Eric Anholt <eric@anholt.net>
>Date: Mon, 30 Jul 2012 11:04:57 -0700
>Subject: [PATCH] i965: Add support for GL_SKIP_DECODE_EXT on other SRGB
> formats.
>
>Fixes some failures in getteximage-formats.
>
>v2: Remove stray include, and drop extra test for encoding == GL_SRGB --
>    _mesa_get_srgb_format_linear() returns the same format if it wasn't SRGB.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48120
>Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
>NOTE: This is a candidate for the 8.0 branch.
>
>Conflicts:
>
>	src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>---
> src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>index 93a0550..3bdf8be 100644
>--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>@@ -583,6 +583,9 @@ translate_tex_format(gl_format mesa_format,
> 		     GLenum depth_mode,
> 		     GLenum srgb_decode)
> {
>+   if (srgb_decode == GL_SKIP_DECODE_EXT)
>+      mesa_format = _mesa_get_srgb_format_linear(mesa_format);
>+
>    switch( mesa_format ) {
> 
>    case MESA_FORMAT_Z16:
>@@ -598,14 +601,6 @@ translate_tex_format(gl_format mesa_format,
>    case MESA_FORMAT_Z32_FLOAT_X24S8:
>       return BRW_SURFACEFORMAT_R32G32_FLOAT;
> 
>-   case MESA_FORMAT_SARGB8:
>-   case MESA_FORMAT_SLA8:
>-   case MESA_FORMAT_SL8:
>-      if (srgb_decode == GL_DECODE_EXT)
>-	 return brw_format_for_mesa_format(mesa_format);
>-      else if (srgb_decode == GL_SKIP_DECODE_EXT)
>-	 return brw_format_for_mesa_format(_mesa_get_srgb_format_linear(mesa_format));
>-
>    case MESA_FORMAT_RGBA8888_REV:
>       /* This format is not renderable? */
>       return BRW_SURFACEFORMAT_R8G8B8A8_UNORM;
>-- 
>1.7.8.6
>

Actions: View | Splinter Review

Attachments on bug 53972: 66021 | 66022 | 67360

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.