From 5a55e8e8d549e97c5947511c2849db5c08c1a5f1 Mon Sep 17 00:00:00 2001
From: Giovanni Mascellani <gmascellani@codeweavers.com>
Date: Fri, 27 Aug 2021 12:05:11 +0200
Subject: [PATCH] vkd3d-shader/hlsl: Move the base type equality case in
 expr_common_base_type.

Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 libs/vkd3d-shader/hlsl.y | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index cb4fd7c8..4c3c0676 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -916,6 +916,9 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl
     };
     int t1_idx = -1, t2_idx = -1, i;
 
+    if (t1 == t2)
+        return t1;
+
     for (i = 0; i < ARRAY_SIZE(types); ++i)
     {
         /* Always convert away from HLSL_TYPE_HALF */
@@ -981,10 +984,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type
         return NULL;
     }
 
-    if (t1->base_type == t2->base_type)
-        base = t1->base_type;
-    else
-        base = expr_common_base_type(t1->base_type, t2->base_type);
+    base = expr_common_base_type(t1->base_type, t2->base_type);
 
     if (t1->dimx == 1 && t1->dimy == 1)
     {