From 127fa5d00c3fbcc23b7f5fea4ab50da061477cba Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 30 Mar 2020 15:53:48 -0700 Subject: [PATCH] freedreno/ir3: fix android build Fixes: e5339fe4a47 ("Move compiler.h and imports.h/c from src/mesa/main into src/util") Signed-off-by: Rob Clark Tested-by: Marge Bot Part-of: --- src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c b/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c index 70234173411..a171cbe7a3c 100644 --- a/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c +++ b/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c @@ -25,7 +25,7 @@ #include "ir3_compiler.h" #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" -#include "mesa/main/macros.h" +#include "util/u_math.h" static inline struct ir3_ubo_range get_ubo_load_range(nir_intrinsic_instr *instr) @@ -53,7 +53,7 @@ gather_ubo_ranges(nir_shader *nir, nir_intrinsic_instr *instr, /* If this is an indirect on UBO 0, we'll still lower it back to * load_uniform. Set the range to cover all of UBO 0. */ - state->range[0].end = align(nir->num_uniforms * 16, 16 * 4); + state->range[0].end = ALIGN(nir->num_uniforms * 16, 16 * 4); } return; -- 2.30.2