Attachment 122214 Details for Bug 94388 – Possible fix based on problem description

[patch] Possible fix based on problem description

0001-r600g-clear-compressed_depthtex-colortex_mask-when-b.patch (text/plain), 1.92 KB, created by Nicolai Hähnle on 2016-03-11 02:22:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolai Hähnle

Created: 2016-03-11 02:22:57 UTC

Size: 1.92 KB

patch

obsolete

>From 4fc8a0453064fc47f461fae3ab062793c749252a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= <nicolai.haehnle@amd.com>
>Date: Thu, 10 Mar 2016 21:19:56 -0500
>Subject: [PATCH] r600g: clear compressed_depthtex/colortex_mask when binding
> buffer texture
>
>---
> src/gallium/drivers/r600/r600_state_common.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
>index 40ceb8d..2211e07 100644
>--- a/src/gallium/drivers/r600/r600_state_common.c
>+++ b/src/gallium/drivers/r600/r600_state_common.c
>@@ -645,21 +645,21 @@ static void r600_set_sampler_views(struct pipe_context *pipe, unsigned shader,
> 		if (rviews[i]) {
> 			struct r600_texture *rtex =
> 				(struct r600_texture*)rviews[i]->base.texture;
>+			bool is_buffer = rviews[i]->base.texture->target == PIPE_BUFFER;
> 
>-			if (rviews[i]->base.texture->target != PIPE_BUFFER) {
>-				if (rtex->is_depth && !rtex->is_flushing_texture) {
>-					dst->views.compressed_depthtex_mask |= 1 << i;
>-				} else {
>-					dst->views.compressed_depthtex_mask &= ~(1 << i);
>-				}
>+			if (!is_buffer && rtex->is_depth && !rtex->is_flushing_texture) {
>+				dst->views.compressed_depthtex_mask |= 1 << i;
>+			} else {
>+				dst->views.compressed_depthtex_mask &= ~(1 << i);
>+			}
> 
>-				/* Track compressed colorbuffers. */
>-				if (rtex->cmask.size) {
>-					dst->views.compressed_colortex_mask |= 1 << i;
>-				} else {
>-					dst->views.compressed_colortex_mask &= ~(1 << i);
>-				}
>+			/* Track compressed colorbuffers. */
>+			if (!is_buffer && rtex->cmask.size) {
>+				dst->views.compressed_colortex_mask |= 1 << i;
>+			} else {
>+				dst->views.compressed_colortex_mask &= ~(1 << i);
> 			}
>+
> 			/* Changing from array to non-arrays textures and vice versa requires
> 			 * updating TEX_ARRAY_OVERRIDE in sampler states on R6xx-R7xx. */
> 			if (rctx->b.chip_class <= R700 &&
>-- 
>2.5.0
>

Actions: View | Splinter Review

Attachments on bug 94388: 122214

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.