Attachment 85162 Details for Bug 49727 – disable ARB_framebuffer_object, print when trying to do both swizzle and linear

[patch] disable ARB_framebuffer_object, print when trying to do both swizzle and linear

0001-nv30-stuff.patch (text/plain), 1.74 KB, created by Ilia Mirkin on 2013-09-04 03:03:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Mirkin

Created: 2013-09-04 03:03:58 UTC

Size: 1.74 KB

patch

obsolete

>From 84d7e2a586c7eeaf57ffa019838ed153af4ce3d4 Mon Sep 17 00:00:00 2001
>From: Ilia Mirkin <imirkin@alum.mit.edu>
>Date: Sat, 31 Aug 2013 13:55:50 -0400
>Subject: [PATCH] nv30 stuff
>
>---
> src/gallium/drivers/nv30/nv30_state_validate.c | 6 ++++++
> src/mesa/state_tracker/st_extensions.c         | 2 +-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/src/gallium/drivers/nv30/nv30_state_validate.c b/src/gallium/drivers/nv30/nv30_state_validate.c
>index 99a9879..0e44282 100644
>--- a/src/gallium/drivers/nv30/nv30_state_validate.c
>+++ b/src/gallium/drivers/nv30/nv30_state_validate.c
>@@ -71,6 +71,12 @@ nv30_validate_fb(struct nv30_context *nv30)
>          rt_format |= NV30_3D_RT_FORMAT_TYPE_SWIZZLED;
>       else
>          rt_format |= NV30_3D_RT_FORMAT_TYPE_LINEAR;
>+
>+      if ((rt_format & NV30_3D_RT_FORMAT_TYPE__MASK) ==
>+          (NV30_3D_RT_FORMAT_TYPE_LINEAR | NV30_3D_RT_FORMAT_TYPE_SWIZZLED)) {
>+         debug_printf("rt_format is both swizzled and linear\n");
>+         rt_format &= ~NV30_3D_RT_FORMAT_TYPE_LINEAR;
>+      }
>    } else {
>       if (fb->nr_cbufs && util_format_get_blocksize(fb->cbufs[0]->format) > 2)
>          rt_format |= NV30_3D_RT_FORMAT_ZETA_Z24S8;
>diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
>index 0b7001b..366f075 100644
>--- a/src/mesa/state_tracker/st_extensions.c
>+++ b/src/mesa/state_tracker/st_extensions.c
>@@ -441,7 +441,7 @@ void st_init_extensions(struct st_context *st)
>         { PIPE_FORMAT_Z32_FLOAT,
>           PIPE_FORMAT_Z32_FLOAT_S8X24_UINT } },
> 
>-      { { o(ARB_framebuffer_object),
>+      { { /*o(ARB_framebuffer_object),*/
>           o(EXT_packed_depth_stencil) },
>         { PIPE_FORMAT_S8_UINT_Z24_UNORM,
>           PIPE_FORMAT_Z24_UNORM_S8_UINT },
>-- 
>1.8.1.5
>

Actions: View | Splinter Review

Attachments on bug 49727: 61353 | 61354 | 61355 | 61356 | 85162

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.