gallium: Use common CONCAT/PASTE macros

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

src/gallium/auxiliary/draw/draw_pt_vsplit.c

@@ -23,6 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "util/macros.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 

src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h

@@ -23,9 +23,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#define PASTE2(name, elt_type) name ## elt_type
-#define CONCAT2(name, elt_type) PASTE2(name, elt_type)
-
 #ifdef ELT_TYPE
 
 /**
@@ -304,8 +301,5 @@ vsplit_segment_fan_linear(struct vsplit_frontend *vsplit, unsigned flags,
 
 #include "draw_split_tmp.h"
 
-#undef PASTE2
-#undef CONCAT2
-
 #undef ELT_TYPE
 #undef ADD_CACHE