From 495dc514ac88314e3909c333d6f3564d671c8c6d Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 24 Sep 2020 13:08:00 -0700
Subject: [PATCH] intel/isl: Don't generate Gen10-specific functions

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>
---
 src/intel/Android.isl.mk   | 20 --------------------
 src/intel/Makefile.sources |  4 ----
 src/intel/isl/isl.c        |  3 ---
 src/intel/isl/isl_priv.h   |  3 ---
 4 files changed, 30 deletions(-)

diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
index d362bd864c8..77d0936af09 100644
--- a/src/intel/Android.isl.mk
+++ b/src/intel/Android.isl.mk
@@ -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 \
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 3f7f7cc9aa0..7cfe7487645 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -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
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 313f0efe96a..ab821839ecf 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -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;                                       \
diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h
index 710c5222ba1..a203ce2d651 100644
--- a/src/intel/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
@@ -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