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

intel/iris: Build gen 12.5 

Reworks:
 * genX_call in iris_screen.c (found by Jason)

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7757>
This commit is contained in:
Jordan Justen 2020-05-15 03:16:51 -07:00 committed by Marge Bot
parent 3b953f0f7a
commit cd3251d6ba
5 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gallium/drivers/iris/Android.mk
View File

@ -121,6 +121,26 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
#
# libiris for gen12hp
#
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_iris_gen125
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
LOCAL_CFLAGS := -DGEN_VERSIONx10=125
LOCAL_C_INCLUDES := $(IRIS_COMMON_INCLUDES)
LOCAL_STATIC_LIBRARIES := $(LIBIRIS_STATIC_LIBS)
LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
###########################################################
include $(CLEAR_VARS)

8
src/gallium/drivers/iris/iris_context.c
View File

@ -259,9 +259,13 @@ iris_destroy_context(struct pipe_context *ctx)
}
#define genX_call(devinfo, func, ...) \
switch (devinfo->gen) { \
switch ((devinfo)->gen) { \
case 12: \
gen12_##func(__VA_ARGS__); \
if (gen_device_info_is_12hp(devinfo)) { \
gen125_##func(__VA_ARGS__); \
} else { \
gen12_##func(__VA_ARGS__); \
} \
break; \
case 11: \
gen11_##func(__VA_ARGS__); \

3
src/gallium/drivers/iris/iris_context.h
View File

@ -985,6 +985,9 @@ void gen9_toggle_preemption(struct iris_context *ice,
# define genX(x) gen12_##x
# include "iris_genx_protos.h"
# undef genX
# define genX(x) gen125_##x
# include "iris_genx_protos.h"
# undef genX
#endif
#endif

10
src/gallium/drivers/iris/iris_screen.c
View File

@ -59,9 +59,13 @@
#include "iris_monitor.h"
#define genX_call(devinfo, func, ...) \
switch (devinfo.gen) { \
switch ((devinfo)->gen) { \
case 12: \
gen12_##func(__VA_ARGS__); \
if (gen_device_info_is_12hp(devinfo)) { \
gen125_##func(__VA_ARGS__); \
} else { \
gen12_##func(__VA_ARGS__); \
} \
break; \
case 11: \
gen11_##func(__VA_ARGS__); \
@ -865,7 +869,7 @@ iris_screen_create(int fd, const struct pipe_screen_config *config)
pscreen->get_driver_query_group_info = iris_get_monitor_group_info;
pscreen->get_driver_query_info = iris_get_monitor_info;
genX_call(screen->devinfo, init_screen_state, screen);
genX_call(&screen->devinfo, init_screen_state, screen);
glsl_type_singleton_init_or_ref();

2
src/gallium/drivers/iris/meson.build
View File

@ -56,7 +56,7 @@ files_libiris = files(
)
iris_gen_libs = []
foreach v : ['80', '90', '110', '120']
foreach v : ['80', '90', '110', '120', '125']
iris_gen_libs += static_library(
'iris_gen@0@'.format(v),
['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack],