fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/isl: Don't generate Gen10-specific functions

Browse source 
v2: Also update Makefile.sources and Android build files.  Noticed by
Lionel.

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:08:00 -07:00
parent 1f00b0f4ef
commit 495dc514ac
4 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/intel/Android.isl.mk
View file

@ -161,25 +161,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
# ---------------------------------------
# Build libmesa_isl_gen10
# ---------------------------------------
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen10
LOCAL_SRC_FILES := $(ISL_GEN10_FILES)
LOCAL_CFLAGS := -DGEN_VERSIONx10=100
LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
# ---------------------------------------
# Build libmesa_isl_gen11
# ---------------------------------------
@ -286,7 +267,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_isl_gen75 \
libmesa_isl_gen8 \
libmesa_isl_gen9 \
libmesa_isl_gen10 \
libmesa_isl_gen11 \
libmesa_isl_gen12 \
libmesa_genxml \

4
src/intel/Makefile.sources
View file

@ -222,10 +222,6 @@ ISL_GEN9_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN10_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN11_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c

3
src/intel/isl/isl.c
View file

@ -2185,9 +2185,6 @@ isl_surf_get_ccs_surf(const struct isl_device *dev,
case 9: \
isl_gen9_##func(__VA_ARGS__); \
break; \
case 10: \
isl_gen10_##func(__VA_ARGS__); \
break; \
case 11: \
isl_gen11_##func(__VA_ARGS__); \
break; \

3
src/intel/isl/isl_priv.h
View file

@ -226,9 +226,6 @@ _isl_memcpy_tiled_to_linear_sse41(uint32_t xt1, uint32_t xt2,
# define genX(x) gen9_##x
# include "isl_genX_priv.h"
# undef genX
# define genX(x) gen10_##x
# include "isl_genX_priv.h"
# undef genX
# define genX(x) gen11_##x
# include "isl_genX_priv.h"
# undef genX