diff options
| author | John Stultz <[email protected]> | 2020-03-12 22:42:29 +0000 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-19 21:20:08 +0000 |
| commit | 5c8ba96a54feaf9bb783bb165bce91ee0c3253f9 (patch) | |
| tree | 5ce5f083aad5791f866910ef161854c3357afa07 /src | |
| parent | 0df48e5d1f09c81bdbc9cc501c5a382c9175da33 (diff) | |
r600: Fix build error in sfn_nir_lower_fs_out_to_vector.cpp
In trying a full build under AOSP, I ran into the following error:
In file included from external/mesa3d/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp:33:
external/libcxx/include/set:942:26: error: the specified comparator type does not provide a const call operator [-Werror,-Wuser-defined-warnings]
static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
^
external/mesa3d/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp:78:34: note: in instantiation of template class 'std::__1::multiset<nir_intrinsic_ins
tr *, r600::nir_intrinsic_instr_less, std::__1::allocator<nir_intrinsic_instr *> >' requested here
using InstrSubSet = std::pair<InstrSet::iterator, InstrSet::iterator>;
^
external/libcxx/include/__tree:967:5: note: from 'diagnose_if' attribute on '__diagnose_non_const_comparator<nir_intrinsic_instr *, r600::nir_intrinsic_instr_less>':
_LIBCPP_DIAGNOSE_WARNING(!std::__invokable<_Compare const&, _Tp const&, _Tp const&>::value,
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/libcxx/include/__config:1244:21: note: expanded from macro '_LIBCPP_DIAGNOSE_WARNING'
__attribute__((diagnose_if(__VA_ARGS__, "warning")))
^ ~~~~~~~~~~~
1 error generated.
Which is pretty opaque to me, but searching the web suggested
adding a cost, which seems to resovle it.
Reviewed-by: Gert Wollny <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4175>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4175>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp index 4441a47dfce..818c1f22566 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_fs_out_to_vector.cpp @@ -42,7 +42,7 @@ using std::vector; using std::array; struct nir_intrinsic_instr_less { - bool operator () (const nir_intrinsic_instr *lhs, const nir_intrinsic_instr *rhs) + bool operator () (const nir_intrinsic_instr *lhs, const nir_intrinsic_instr *rhs) const { nir_variable *vlhs = nir_deref_instr_get_variable(nir_src_as_deref(lhs->src[0])); nir_variable *vrhs = nir_deref_instr_get_variable(nir_src_as_deref(rhs->src[0])); |