Attachment 110153 Details for Bug 86089 – fix loops with no repeat.

[patch] fix loops with no repeat.

0001-r600g-sb-fix-issues-cause-by-GLSL-switching-to-loops.patch (text/plain), 1.49 KB, created by Dave Airlie on 2014-11-28 03:37:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2014-11-28 03:37:48 UTC

Size: 1.49 KB

patch

obsolete

>From f248be55bdaf14ee6e2319ec4d8c0ed96433200a Mon Sep 17 00:00:00 2001
>From: Dave Airlie <airlied@redhat.com>
>Date: Fri, 28 Nov 2014 00:49:48 +0000
>Subject: [PATCH] r600g/sb: fix issues cause by GLSL switching to loops for
> switch
>
>---
> src/gallium/drivers/r600/sb/sb_bc_finalize.cpp | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
>index f0849ca..2e04570 100644
>--- a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
>+++ b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
>@@ -46,15 +46,22 @@ int bc_finalizer::run() {
> 	for (regions_vec::reverse_iterator I = rv.rbegin(), E = rv.rend(); I != E;
> 			++I) {
> 		region_node *r = *I;
>-
>+		bool is_if = false;
> 		assert(r);
> 
>-		bool loop = r->is_loop();
>+		assert(r->first);
>+		if (r->first->is_container()) {
>+			container_node *repdep1 = static_cast<container_node*>(r->first);
>+			assert(repdep1->is_depart() || repdep1->is_repeat());
>+			if_node *n_if = static_cast<if_node*>(repdep1->first);
>+			if (n_if && n_if->is_if())
>+				is_if = true;
>+		}
> 
>-		if (loop)
>-			finalize_loop(r);
>-		else
>+		if (is_if)
> 			finalize_if(r);
>+		else
>+			finalize_loop(r);
> 
> 		r->expand();
> 	}
>@@ -168,9 +175,6 @@ void bc_finalizer::finalize_if(region_node* r) {
> 
> 	if (n_if) {
> 
>-
>-		assert(n_if->is_if());
>-
> 		container_node *repdep2 = static_cast<container_node*>(n_if->first);
> 		assert(repdep2->is_depart() || repdep2->is_repeat());
> 
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 86089: 109185 | 110153

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.