diff --git a/src/gallium/drivers/iris/Android.mk b/src/gallium/drivers/iris/Android.mk index 0281b3bc74b..70e2957cd35 100644 --- a/src/gallium/drivers/iris/Android.mk +++ b/src/gallium/drivers/iris/Android.mk @@ -81,26 +81,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) -# -# libiris for gen10 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_iris_gen10 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES) -LOCAL_CFLAGS := -DGEN_VERSIONx10=100 - -LOCAL_C_INCLUDES := $(IRIS_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(LIBIRIS_STATIC_LIBS) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - # # libiris for gen11 # @@ -169,7 +149,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_intel_perf \ libmesa_iris_gen8 \ libmesa_iris_gen9 \ - libmesa_iris_gen10 \ libmesa_iris_gen11 \ libmesa_iris_gen12 diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c index 216e770a6fa..6005a2a6f3b 100644 --- a/src/gallium/drivers/iris/iris_context.c +++ b/src/gallium/drivers/iris/iris_context.c @@ -221,9 +221,6 @@ iris_destroy_context(struct pipe_context *ctx) case 11: \ gen11_##func(__VA_ARGS__); \ break; \ - case 10: \ - gen10_##func(__VA_ARGS__); \ - break; \ case 9: \ gen9_##func(__VA_ARGS__); \ break; \ diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index 916ea232163..b83241dd90a 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -968,9 +968,6 @@ void gen9_toggle_preemption(struct iris_context *ice, # define genX(x) gen9_##x # include "iris_genx_protos.h" # undef genX -# define genX(x) gen10_##x -# include "iris_genx_protos.h" -# undef genX # define genX(x) gen11_##x # include "iris_genx_protos.h" # undef genX diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index f3e2480c94f..05bace8b67e 100644 --- a/src/gallium/drivers/iris/meson.build +++ b/src/gallium/drivers/iris/meson.build @@ -56,7 +56,7 @@ files_libiris = files( ) iris_gen_libs = [] -foreach v : ['80', '90', '100', '110', '120'] +foreach v : ['80', '90', '110', '120'] iris_gen_libs += static_library( 'iris_gen@0@'.format(v), ['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack],