AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/isl/icl: Build and use gen11 surface state emit functions

Browse Source 
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Anuj Phogat
2017-07-20 15:59:49 -07:00
parent 0427bd4954
commit bff24e2173
6 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/Android.isl.mk
+20
View File
@@ -179,6 +179,25 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
# ---------------------------------------
# Build libmesa_isl_gen11
# ---------------------------------------
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen11
LOCAL_SRC_FILES := $(ISL_GEN11_FILES)
LOCAL_CFLAGS := -DGEN_VERSIONx10=110
LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
# ---------------------------------------
# Build libmesa_isl
# ---------------------------------------
@@ -207,6 +226,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_isl_gen8 \
libmesa_isl_gen9 \
libmesa_isl_gen10 \
libmesa_isl_gen11 \
libmesa_genxml
# Autogenerated sources
src/intel/Makefile.isl.am
+4
View File
@@ -28,6 +28,7 @@ ISL_GEN_LIBS = \
isl/libisl-gen8.la \
isl/libisl-gen9.la \
isl/libisl-gen10.la \
isl/libisl-gen11.la \
$(NULL)
noinst_LTLIBRARIES += $(ISL_GEN_LIBS) isl/libisl.la
@@ -59,6 +60,9 @@ isl_libisl_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
isl_libisl_gen10_la_SOURCES = $(ISL_GEN10_FILES)
isl_libisl_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100
isl_libisl_gen11_la_SOURCES = $(ISL_GEN11_FILES)
isl_libisl_gen11_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=110
BUILT_SOURCES += $(ISL_GENERATED_FILES)
isl/isl_format_layout.c: isl/gen_format_layout.py \
src/intel/Makefile.sources
+4
View File
@@ -203,6 +203,10 @@ 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
ISL_GENERATED_FILES = \
isl/isl_format_layout.c
src/intel/isl/isl.c
+3
View File
@@ -1778,6 +1778,9 @@ isl_surf_get_ccs_surf(const struct isl_device *dev,
case 10: \
isl_gen10_##func(__VA_ARGS__); \
break; \
case 11: \
isl_gen11_##func(__VA_ARGS__); \
break; \
default: \
assert(!"Unknown hardware generation"); \
}
src/intel/isl/isl_priv.h
+3
View File
@@ -190,6 +190,9 @@ isl_extent3d_el_to_sa(enum isl_format fmt, struct isl_extent3d extent_el)
# define genX(x) gen10_##x
# include "isl_genX_priv.h"
# undef genX
# define genX(x) gen11_##x
# include "isl_genX_priv.h"
# undef genX
#endif
#endif /* ISL_PRIV_H */
src/intel/isl/meson.build
+1 -1
View File
@@ -51,7 +51,7 @@ isl_gen9_files = files(
isl_gen_libs = []
foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
['70', isl_gen7_files], ['75', []], ['80', isl_gen8_files],
['90', isl_gen9_files], ['100', []]]
['90', isl_gen9_files], ['100', []], ['110', []]]
_gen = g[0]
isl_gen_libs += static_library(
'libisl_gen@0@'.format(_gen),