From: Matt Coster <matt.coster@imgtec.com>
Date: Thu, 9 Jun 2022 14:03:01 +0000 (+0100)
Subject: intel: Use common CONCAT/PASTE macros
X-Git-Tag: upstream/23.3.3~16920
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afb83080879310986680b0a0c7046a05963c06b1;p=platform%2Fupstream%2Fmesa.git

intel: Use common CONCAT/PASTE macros

Signed-off-by: Matt Coster <matt.coster@imgtec.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16945>
---

diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h
index 394c5d9..130ff61 100644
--- a/src/intel/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
@@ -248,8 +248,6 @@ _isl_memcpy_tiled_to_linear_sse41(uint32_t xt1, uint32_t xt2,
                                   isl_memcpy_type copy_type);
 
 /* This is useful for adding the isl_prefix to genX functions */
-#define PASTE2(x, y) x ## y
-#define CONCAT2(x, y) PASTE2(x, y)
 #define isl_genX(x) CONCAT2(isl_, genX(x))
 
 #ifdef genX