diff options
| author | Dylan Baker <[email protected]> | 2018-08-16 17:20:38 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-09-07 10:21:26 -0700 |
| commit | 80825abb5d1a7491035880253ffd531c55acae6b (patch) | |
| tree | 6e12b637c7c5468c39def882bf3654e5bd256fb0 /src/broadcom | |
| parent | aa4386ebfed6a76badae9e1ecf783a372375f072 (diff) | |
move u_math to src/util
Currently we have two sets of functions for bit counts, one in gallium
and one in core mesa. The ones in core mesa are header only in many
cases, since they reduce to "#define _mesa_bitcount popcount", but they
provide a fallback implementation. This is important because 32bit msvc
doesn't have popcountll, just popcount; so when nir (for example)
includes the core mesa header it doesn't (and shouldn't) link with core
mesa. To fix this we'll promote the version out of gallium util, then
replace the core mesa uses with the util version, since nir (and other
non-core mesa users) can and do link with mesautils.
Acked-by: Eric Engestrom <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/broadcom')
| -rw-r--r-- | src/broadcom/cle/v3d_packet_helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/broadcom/cle/v3d_packet_helpers.h b/src/broadcom/cle/v3d_packet_helpers.h index f340b790697..c46089a0e60 100644 --- a/src/broadcom/cle/v3d_packet_helpers.h +++ b/src/broadcom/cle/v3d_packet_helpers.h @@ -26,7 +26,7 @@ #include <stdbool.h> #include <assert.h> #include <math.h> -#include <gallium/auxiliary/util/u_math.h> +#include "util/u_math.h" #ifdef HAVE_VALGRIND #include <valgrind.h> |