From af6d6f5c4327307234990fed2c13a08afff8e689 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Wed, 8 Jul 2020 13:55:21 -0700
Subject: [PATCH] intel/tools: Pass integers, not enums, to stride()

Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5956>
---
 src/intel/tools/i965_gram.y | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/intel/tools/i965_gram.y b/src/intel/tools/i965_gram.y
index 03ebc7e3e6d..44a25018c56 100644
--- a/src/intel/tools/i965_gram.y
+++ b/src/intel/tools/i965_gram.y
@@ -1938,14 +1938,14 @@ indirectregion:
 region:
 	%empty
 	{
-		$$ = stride($$, BRW_VERTICAL_STRIDE_1, BRW_WIDTH_2, BRW_HORIZONTAL_STRIDE_1);
+		$$ = stride($$, 0, 1, 0);
 	}
 	| LANGLE exp RANGLE
 	{
 		if ($2 != 0 && ($2 > 32 || !isPowerofTwo($2)))
 			error(&@2, "Invalid VertStride %d\n", $2);
 
-		$$ = stride($$, $2, BRW_WIDTH_1, 0);
+		$$ = stride($$, $2, 1, 0);
 	}
 	| LANGLE exp COMMA exp COMMA exp RANGLE
 	{
@@ -1999,7 +1999,8 @@ region_wh:
 			error(&@4, "Invalid Horizontal stride in"
 				   " region_wh %d\n", $4);
 
-		$$ = stride($$, BRW_VERTICAL_STRIDE_ONE_DIMENSIONAL, $2, $4);
+		$$ = stride($$, 0, $2, $4);
+		$$.vstride = BRW_VERTICAL_STRIDE_ONE_DIMENSIONAL;
 	}
 	;
 
-- 
2.30.2