From: Matt Turner <mattst88@gmail.com>
Date: Wed, 15 Jul 2020 23:32:37 +0000 (-0700)
Subject: intel/tools: Simplify dstregion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=363e5ef5a5d43c0c59dbbdb3740f6bcadfb95a89;p=mesa.git

intel/tools: Simplify dstregion

Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5956>
---

diff --git a/src/intel/tools/i965_gram.y b/src/intel/tools/i965_gram.y
index bddf9781ed9..03ebc7e3e6d 100644
--- a/src/intel/tools/i965_gram.y
+++ b/src/intel/tools/i965_gram.y
@@ -1426,14 +1426,9 @@ dstoperand:
 	dstreg dstregion writemask reg_type
 	{
 		$$ = $1;
-
-		if ($2 == -1) {
-			$$.hstride = BRW_HORIZONTAL_STRIDE_1;
-			$$.vstride = BRW_VERTICAL_STRIDE_1;
-			$$.width = BRW_WIDTH_1;
-		} else {
-			$$.hstride = $2;
-		}
+		$$.vstride = BRW_VERTICAL_STRIDE_1;
+		$$.width = BRW_WIDTH_1;
+		$$.hstride = $2;
 		$$.type = $4;
 		$$.writemask = $3;
 		$$.swizzle = BRW_SWIZZLE_NOOP;
@@ -1457,13 +1452,9 @@ dstoperandex:
 	| nullreg dstregion writemask reg_type
 	{
 		$$ = $1;
-		if ($2 == -1) {
-			$$.hstride = BRW_HORIZONTAL_STRIDE_1;
-			$$.vstride = BRW_VERTICAL_STRIDE_1;
-			$$.width = BRW_WIDTH_1;
-		} else {
-			$$.hstride = $2;
-		}
+		$$.vstride = BRW_VERTICAL_STRIDE_1;
+		$$.width = BRW_WIDTH_1;
+		$$.hstride = $2;
 		$$.writemask = $3;
 		$$.type = $4;
 	}
@@ -1926,7 +1917,10 @@ immval:
 
 /* Regions */
 dstregion:
-	%empty 	{ $$ = -1; }
+	%empty
+	{
+		$$ = BRW_HORIZONTAL_STRIDE_1;
+	}
 	| LANGLE exp RANGLE
 	{
 		if ($2 != 0 && ($2 > 4 || !isPowerofTwo($2)))