diff options
| author | Ian Romanick <[email protected]> | 2017-07-26 13:32:01 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2018-03-29 14:09:30 -0700 |
| commit | 4925347ec5d469574f1280e972940cfea345ed6e (patch) | |
| tree | 15a22a37ff451cde08b2493c98cf484a53009b66 | |
| parent | ef7a4c90155cb180a4f0d289594ef11da9a2b21a (diff) | |
util: Include bitscan.h directly
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 <[email protected]>
Reviewed-by: Eduardo Lima Mitev <[email protected]>
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 1 | ||||
| -rw-r--r-- | src/compiler/nir/nir.c | 1 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_alu.c | 1 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_glsl450.c | 1 | ||||
| -rw-r--r-- | src/util/bitset.h | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 7efbe4b31aa..053c19808f5 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -28,6 +28,7 @@ #include "sid.h" #include "nir/nir.h" #include "util/bitscan.h" +#include "util/u_math.h" #include "ac_shader_abi.h" #include "ac_shader_util.h" diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index a97b119bf72..3fb16e6ca5f 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -28,6 +28,7 @@ #include "nir.h" #include "nir_control_flow_private.h" #include "util/half_float.h" +#include <limits.h> #include <assert.h> #include <math.h> diff --git a/src/compiler/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c index 01be397e271..fc378495b81 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 7d32914d516..eb0b90f7976 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 b4c21520238..75e29a9a519 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 |