intel: Unify naming of CONCAT/PASTE macros

In isl/isl_priv.h:
 - __PASTE2 => PASTE2
 - __PASTE => CONCAT2

Signed-off-by: Matt Coster <matt.coster@imgtec.com>
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 a215bb9..394c5d9 100644 (file)
--- a/src/intel/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
@@ -248,9 +248,9 @@ _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 __PASTE(x, y) __PASTE2(x, y)
-#define isl_genX(x) __PASTE(isl_, genX(x))
+#define PASTE2(x, y) x ## y
+#define CONCAT2(x, y) PASTE2(x, y)
+#define isl_genX(x) CONCAT2(isl_, genX(x))
 
 #ifdef genX
 #  include "isl_genX_priv.h"