diff options
| author | Marijn Suijten <marijns95@gmail.com> | 2020-10-20 20:00:18 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-10-20 19:17:52 +0000 |
| commit | fa483d8cd1bc975c339082435a2e0f657959ea39 (patch) | |
| tree | e53a08c63fcf19672e7d81d88fe18cc94ead0dc5 | |
| parent | 0f82c99c4e62d999efaa4d9355c151d00d1931ac (diff) | |
android: gallium/auxiliary: Deduplicate nir_to_tgsi.c inclusion
Both commits add nir_to_tgsi.c to a different variable, causing a
build-time error when compiling in an AOSP tree:
build/make/core/binary.mk:970: error: overriding commands for target `..../obj/STATIC_LIBRARIES/libmesa_gallium_intermediates/nir/nir_to_tgsi.o', previously defined at build/make/core/binary.mk:970
Move all sources into NIR_SOURCES to resolve this issue.
Fixes: d0f8fe59091 ("softpipe: Switch to using NIR as the shader format from mesa/st.")
Fixes: 34cc6a804ec ("gallium: Add a nir-to-TGSI pass.")
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7237>
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index ccafd31669b..c3d477baad7 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -105,8 +105,6 @@ C_SOURCES := \ indices/u_indices_priv.h \ indices/u_primconvert.c \ indices/u_primconvert.h \ - nir/nir_to_tgsi.c \ - nir/nir_to_tgsi.h \ os/os_mman.h \ os/os_process.c \ os/os_process.h \ @@ -318,6 +316,7 @@ NIR_SOURCES := \ nir/tgsi_to_nir.c \ nir/tgsi_to_nir.h \ nir/nir_to_tgsi.c \ + nir/nir_to_tgsi.h \ nir/nir_draw_helpers.c \ nir/nir_draw_helpers.h |