fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 17:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

android: gallium/auxiliary: Deduplicate nir_to_tgsi.c inclusion

Browse source 
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: d0f8fe5909 ("softpipe: Switch to using NIR as the shader format from mesa/st.")
Fixes: 34cc6a804e ("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>
This commit is contained in:
Marijn Suijten 2020-10-20 20:00:18 +02:00 • committed by Marge Bot
parent 0f82c99c4e
commit fa483d8cd1
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/auxiliary/Makefile.sources
View file

@ -105,8 +105,6 @@ C_SOURCES := \
indices/u_indices_priv.h \ indices/u_indices_priv.h \
indices/u_primconvert.c \ indices/u_primconvert.c \
indices/u_primconvert.h \ indices/u_primconvert.h \
nir/nir_to_tgsi.c \
nir/nir_to_tgsi.h \
os/os_mman.h \ os/os_mman.h \
os/os_process.c \ os/os_process.c \
os/os_process.h \ os/os_process.h \
@ -318,6 +316,7 @@ NIR_SOURCES := \
nir/tgsi_to_nir.c \ nir/tgsi_to_nir.c \
nir/tgsi_to_nir.h \ nir/tgsi_to_nir.h \
nir/nir_to_tgsi.c \ nir/nir_to_tgsi.c \
nir/nir_to_tgsi.h \
nir/nir_draw_helpers.c \ nir/nir_draw_helpers.c \
nir/nir_draw_helpers.h nir/nir_draw_helpers.h