From 9c19a3874d862579292291ffec5954a610702efb Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 24 Sep 2020 12:36:13 -0700 Subject: [PATCH] i965: Don't build Gen10-specific files and libraries Reviewed-by: Jason Ekstrand Part-of: --- src/mesa/drivers/dri/i965/Android.mk | 22 ---------------------- src/mesa/drivers/dri/i965/Makefile.sources | 6 ------ src/mesa/drivers/dri/i965/meson.build | 2 +- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 29b46147f39..b0b1747165a 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -48,7 +48,6 @@ I965_PERGEN_LIBS := \ libmesa_i965_gen75 \ libmesa_i965_gen8 \ libmesa_i965_gen9 \ - libmesa_i965_gen10 \ libmesa_i965_gen11 # --------------------------------------- @@ -219,27 +218,6 @@ LOCAL_CFLAGS := -DGEN_VERSIONx10=90 include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) -# --------------------------------------- -# Build libmesa_i965_gen10 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gen10 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gen10_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGEN_VERSIONx10=100 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - # --------------------------------------- # Build libmesa_i965_gen11 # --------------------------------------- diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 469ee2f5d2d..a226485373d 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -158,12 +158,6 @@ i965_gen9_FILES = \ genX_pipe_control.c \ genX_state_upload.c -i965_gen10_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - i965_gen11_FILES = \ genX_blorp_exec.c \ genX_boilerplate.h \ diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build index 39f8e19f7ce..68459b1111a 100644 --- a/src/mesa/drivers/dri/i965/meson.build +++ b/src/mesa/drivers/dri/i965/meson.build @@ -131,7 +131,7 @@ files_i965 = files( ) i965_gen_libs = [] -foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110'] +foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '110'] i965_gen_libs += static_library( 'i965_gen@0@'.format(v), ['genX_blorp_exec.c', 'genX_boilerplate.h', 'genX_pipe_control.c',