From c411e2df705786dff8f321b3fdd7cbc9858524ab Mon Sep 17 00:00:00 2001 From: Matt Coster Date: Wed, 8 Jun 2022 11:44:49 +0100 Subject: [PATCH] gallium: Use common CONCAT/PASTE macros Signed-off-by: Matt Coster Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/auxiliary/draw/draw_pt_vsplit.c | 1 + src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_pt_vsplit.c b/src/gallium/auxiliary/draw/draw_pt_vsplit.c index 42f01536f5e..86548b817c0 100644 --- a/src/gallium/auxiliary/draw/draw_pt_vsplit.c +++ b/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" diff --git a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h index 98b44ee0a62..53fa510917d 100644 --- a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h +++ b/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