OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Rename GENx prefix in macros to GFXx in build files

Browse Source 
Commands used to do the changes:
export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965"
grep -E "GEN[[:digit:]]+[[:alpha:]_]*_FILES" -rIl $SEARCH_PATH | xargs sed -ie "s/GEN\([[:digit:]]\+[[:alpha:]_]*_FILES\)/GFX\1/g"

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9936>
This commit is contained in:
Anuj Phogat
2021-03-30 12:22:33 -07:00
committed by Marge Bot
parent dc28390e3c
commit 0cfe7e3968
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen4
LOCAL_SRC_FILES := $(ISL_GEN4_FILES)
LOCAL_SRC_FILES := $(ISL_GFX4_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=40
@@ -55,7 +55,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen5
LOCAL_SRC_FILES := $(ISL_GEN5_FILES)
LOCAL_SRC_FILES := $(ISL_GFX5_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=50
@@ -74,7 +74,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen6
LOCAL_SRC_FILES := $(ISL_GEN6_FILES)
LOCAL_SRC_FILES := $(ISL_GFX6_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=60
@@ -93,7 +93,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen7
LOCAL_SRC_FILES := $(ISL_GEN7_FILES)
LOCAL_SRC_FILES := $(ISL_GFX7_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=70
@@ -112,7 +112,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen75
LOCAL_SRC_FILES := $(ISL_GEN75_FILES)
LOCAL_SRC_FILES := $(ISL_GFX75_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=75
@@ -131,7 +131,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen8
LOCAL_SRC_FILES := $(ISL_GEN8_FILES)
LOCAL_SRC_FILES := $(ISL_GFX8_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=80
@@ -150,7 +150,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen9
LOCAL_SRC_FILES := $(ISL_GEN9_FILES)
LOCAL_SRC_FILES := $(ISL_GFX9_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=90
@@ -169,7 +169,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen11
LOCAL_SRC_FILES := $(ISL_GEN11_FILES)
LOCAL_SRC_FILES := $(ISL_GFX11_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=110
@@ -188,7 +188,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen12
LOCAL_SRC_FILES := $(ISL_GEN12_FILES)
LOCAL_SRC_FILES := $(ISL_GFX12_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=120
@@ -207,7 +207,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen125
LOCAL_SRC_FILES := $(ISL_GEN125_FILES)
LOCAL_SRC_FILES := $(ISL_GFX125_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=125

14
src/intel/Android.vulkan.mk
View File

@@ -70,7 +70,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen7
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN7_FILES)
LOCAL_SRC_FILES := $(VULKAN_GFX7_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=70
LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -91,7 +91,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen75
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN75_FILES)
LOCAL_SRC_FILES := $(VULKAN_GFX75_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=75
LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -112,7 +112,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen8
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN8_FILES)
LOCAL_SRC_FILES := $(VULKAN_GFX8_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=80
LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -133,7 +133,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen9
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN9_FILES)
LOCAL_SRC_FILES := $(VULKAN_GFX9_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=90
LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -154,7 +154,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen11
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN11_FILES)
LOCAL_SRC_FILES := $(VULKAN_GFX11_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=110
LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -175,7 +175,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen12
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN12_FILES)
LOCAL_SRC_FILES := $(VULKAN_GFX12_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=120
LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
@@ -196,7 +196,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen125
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN125_FILES)
LOCAL_SRC_FILES := $(VULKAN_GFX125_FILES)
LOCAL_CFLAGS := -DGFX_VERx10=125
LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)

34
src/intel/Makefile.sources
View File

@@ -194,55 +194,55 @@ ISL_FILES = \
isl/isl_priv.h \
isl/isl_storage_image.c
ISL_GEN4_FILES = \
ISL_GFX4_FILES = \
isl/isl_gfx4.c \
isl/isl_gfx4.h \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN5_FILES = \
ISL_GFX5_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN6_FILES = \
ISL_GFX6_FILES = \
isl/isl_gfx6.c \
isl/isl_gfx6.h \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN7_FILES = \
ISL_GFX7_FILES = \
isl/isl_gfx7.c \
isl/isl_gfx7.h \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN75_FILES = \
ISL_GFX75_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN8_FILES = \
ISL_GFX8_FILES = \
isl/isl_gfx8.c \
isl/isl_gfx8.h \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN9_FILES = \
ISL_GFX9_FILES = \
isl/isl_gfx9.c \
isl/isl_gfx9.h \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN11_FILES = \
ISL_GFX11_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN12_FILES = \
ISL_GFX12_FILES = \
isl/isl_gfx12.c \
isl/isl_gfx12.h \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN125_FILES = \
ISL_GFX125_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
@@ -321,31 +321,31 @@ VULKAN_GENX_FILES := \
vulkan/genX_query.c \
vulkan/genX_state.c
VULKAN_GEN7_FILES := \
VULKAN_GFX7_FILES := \
vulkan/gfx7_cmd_buffer.c \
$(VULKAN_GENX_FILES)
VULKAN_GEN75_FILES := \
VULKAN_GFX75_FILES := \
vulkan/gfx7_cmd_buffer.c \
$(VULKAN_GENX_FILES)
VULKAN_GEN8_FILES := \
VULKAN_GFX8_FILES := \
vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES)
VULKAN_GEN9_FILES := \
VULKAN_GFX9_FILES := \
vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES)
VULKAN_GEN11_FILES := \
VULKAN_GFX11_FILES := \
vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES)
VULKAN_GEN12_FILES := \
VULKAN_GFX12_FILES := \
vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES)
VULKAN_GEN125_FILES := \
VULKAN_GFX125_FILES := \
vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES)