anv: Don't generate Gen10-specific functions

v2: Re-wrap lines in meson.build.  Suggested by Jason.

v3: Also update Makefile.sources and Android build files.  Noticed by
Lionel.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> [v2]
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6899>

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index c5280b0..3f842f2 100644 (file)
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -148,27 +148,6 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libanv for gen10
-#
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_anv_gen10
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-
-LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES)
-LOCAL_CFLAGS := -DGEN_VERSIONx10=100
-
-LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
-
-LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES)
-
-LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
-LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-#
 # libanv for gen11
 #
 
@@ -312,7 +291,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_anv_gen75 \
        libmesa_anv_gen8 \
        libmesa_anv_gen9 \
-       libmesa_anv_gen10 \
        libmesa_anv_gen11 \
        libmesa_anv_gen12 \
        libmesa_intel_compiler

diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 7cfe748..4c433d1 100644 (file)
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -324,10 +324,6 @@ VULKAN_GEN9_FILES := \
        vulkan/gen8_cmd_buffer.c \
        $(VULKAN_GENX_FILES)
 
-VULKAN_GEN10_FILES := \
-       vulkan/gen8_cmd_buffer.c \
-       $(VULKAN_GENX_FILES)
-
 VULKAN_GEN11_FILES := \
        vulkan/gen8_cmd_buffer.c \
        $(VULKAN_GENX_FILES)

diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index 7eeca75..953596c 100644 (file)
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -110,9 +110,6 @@ anv_device_init_blorp(struct anv_device *device)
    case 9:
       device->blorp.exec = gen9_blorp_exec;
       break;
-   case 10:
-      device->blorp.exec = gen10_blorp_exec;
-      break;
    case 11:
       device->blorp.exec = gen11_blorp_exec;
       break;

diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index ffc9adf..fd3a92d 100644 (file)
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -390,9 +390,6 @@ VkResult anv_ResetCommandBuffer(
    case 9:                                         \
       gen9_##func(__VA_ARGS__);                    \
       break;                                       \
-   case 10:                                        \
-      gen10_##func(__VA_ARGS__);                   \
-      break;                                       \
    case 11:                                        \
       gen11_##func(__VA_ARGS__);                   \
       break;                                       \

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 61607ae..6efa2c7 100644 (file)
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -3010,9 +3010,6 @@ VkResult anv_CreateDevice(
    case 9:
       result = gen9_init_device_state(device);
       break;
-   case 10:
-      result = gen10_init_device_state(device);
-      break;
    case 11:
       result = gen11_init_device_state(device);
       break;

diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py
index ff16618..fa74e1c 100644 (file)
--- a/src/intel/vulkan/anv_entrypoints_gen.py
+++ b/src/intel/vulkan/anv_entrypoints_gen.py
@@ -43,7 +43,6 @@ LAYERS = [
     'gen75',
     'gen8',
     'gen9',
-    'gen10',
     'gen11',
     'gen12',
 ]
@@ -524,9 +523,6 @@ anv_resolve_device_entrypoint(const struct gen_device_info *devinfo, uint32_t in
    case 11:
       genX_table = &gen11_device_dispatch_table;
       break;
-   case 10:
-      genX_table = &gen10_device_dispatch_table;
-      break;
    case 9:
       genX_table = &gen9_device_dispatch_table;
       break;

diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 4ebfa0d..d6b9aea 100644 (file)
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -4600,9 +4600,6 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(anv_performance_configuration_intel, base,
 #  define genX(x) gen9_##x
 #  include "anv_genX.h"
 #  undef genX
-#  define genX(x) gen10_##x
-#  include "anv_genX.h"
-#  undef genX
 #  define genX(x) gen11_##x
 #  include "anv_genX.h"
 #  undef genX

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index fe5e654..36e1689 100644 (file)
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -79,8 +79,7 @@ anv_gen_files = files(
 )
 foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
              ['80', ['gen8_cmd_buffer.c']], ['90', ['gen8_cmd_buffer.c']],
-             ['100', ['gen8_cmd_buffer.c']], ['110', ['gen8_cmd_buffer.c']],
-             ['120', ['gen8_cmd_buffer.c']]]
+             ['110', ['gen8_cmd_buffer.c']], ['120', ['gen8_cmd_buffer.c']]]
   _gen = g[0]
   libanv_gen_libs += static_library(
     'anv_gen@0@'.format(_gen),