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

iris: Don't generate Gen10-specific functions

Browse source 
v2: Also update Makefile.sources and Android build files.  Noticed by
Lionel.  Remove more stuff from iris_context.h.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> [v1]
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6899>
This commit is contained in:
Ian Romanick 2020-09-24 13:28:03 -07:00
parent 495dc514ac
commit 5490f5cbce
4 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gallium/drivers/iris/Android.mk
View file

@ -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

3
src/gallium/drivers/iris/iris_context.c
View file

@ -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; \

3
src/gallium/drivers/iris/iris_context.h
View file

@ -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

2
src/gallium/drivers/iris/meson.build
View file

@ -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],