From: Ian Romanick <ian.d.roman...@intel.com> Previously bitset.h would include u_math.h to get bitscan.h. u_math.h lives in src/gallium/auxiliary/util while both bitset.h and bitscan.h live in src/util. Having the one file directly include another file that lives in the same directory makes much more sense.
As a side-effect, several files need to directly include standard header files that were previously indirectly included. v2: Fix build break in src/amd/common/ac_nir_to_llvm.c. Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> --- src/amd/common/ac_nir_to_llvm.c | 1 + src/compiler/nir/nir.c | 1 + src/compiler/spirv/vtn_alu.c | 1 + src/compiler/spirv/vtn_glsl450.c | 1 + src/util/bitset.h | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 1ecdeca..08204a4 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -29,6 +29,7 @@ #include "nir/nir.h" #include "../vulkan/radv_descriptor_set.h" #include "util/bitscan.h" +#include "util/u_math.h" #include <llvm-c/Transforms/Scalar.h> #include "ac_shader_abi.h" #include "ac_shader_info.h" diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 7380bf4..ffe880c 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -27,6 +27,7 @@ #include "nir.h" #include "nir_control_flow_private.h" +#include <limits.h> #include <assert.h> nir_shader * diff --git a/src/compiler/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c index ecf9cbc..ad3f217 100644 --- a/src/compiler/spirv/vtn_alu.c +++ b/src/compiler/spirv/vtn_alu.c @@ -21,6 +21,7 @@ * IN THE SOFTWARE. */ +#include <math.h> #include "vtn_private.h" /* diff --git a/src/compiler/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c index c30dcc7..0540d5b 100644 --- a/src/compiler/spirv/vtn_glsl450.c +++ b/src/compiler/spirv/vtn_glsl450.c @@ -25,6 +25,7 @@ * */ +#include <math.h> #include "vtn_private.h" #include "GLSL.std.450.h" diff --git a/src/util/bitset.h b/src/util/bitset.h index 2404ce7..8c9e856 100644 --- a/src/util/bitset.h +++ b/src/util/bitset.h @@ -31,7 +31,7 @@ #ifndef BITSET_H #define BITSET_H -#include "util/u_math.h" +#include "util/bitscan.h" /**************************************************************************** * generic bitset implementation -- 2.9.5 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
