Commit fa483d8c authored by Marijn Suijten's avatar Marijn Suijten 🦀 Committed by Marge Bot
Browse files

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/ error: overriding commands for target `..../obj/STATIC_LIBRARIES/libmesa_gallium_intermediates/nir/nir_to_tgsi.o', previously defined at build/make/core/

Move all sources into NIR_SOURCES to resolve this issue.

Fixes: d0f8fe59 ("softpipe: Switch to using NIR as the shader format from mesa/st.")
Fixes: 34cc6a80

 ("gallium: Add a nir-to-TGSI pass.")

Reviewed-by: Emma Anholt's avatarEric Anholt <>
Part-of: <!7237>
parent 0f82c99c
Pipeline #216040 waiting for manual action with stages
......@@ -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 \
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment