fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 22:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965/icl: Build and use gen11 functions for genxml state-upload and blorp

Browse source 
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Anuj Phogat 2017-07-20 16:00:36 -07:00
parent 85f319155f
commit 93f601d7ed
8 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/mesa/drivers/dri/i965/Android.mk
View file

@ -48,7 +48,8 @@ I965_PERGEN_LIBS := \
libmesa_i965_gen75 \
libmesa_i965_gen8 \
libmesa_i965_gen9 \
libmesa_i965_gen10
libmesa_i965_gen10 \
libmesa_i965_gen11
# ---------------------------------------
# Build libmesa_i965_gen4
@ -239,6 +240,27 @@ LOCAL_CFLAGS := -DGEN_VERSIONx10=100
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
# ---------------------------------------
# Build libmesa_i965_gen11
# ---------------------------------------
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen11
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
LOCAL_SRC_FILES := $(i965_gen11_FILES)
LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
LOCAL_CFLAGS := -DGEN_VERSIONx10=110
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
# ---------------------------------------
# Build i965_dri
# ---------------------------------------

6
src/mesa/drivers/dri/i965/Makefile.am
View file

@ -57,7 +57,8 @@ I965_PERGEN_LIBS = \
libi965_gen75.la \
libi965_gen8.la \
libi965_gen9.la \
libi965_gen10.la
libi965_gen10.la \
libi965_gen11.la
libi965_gen4_la_SOURCES = $(i965_gen4_FILES)
libi965_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40
@ -86,6 +87,9 @@ libi965_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
libi965_gen10_la_SOURCES = $(i965_gen10_FILES)
libi965_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100
libi965_gen11_la_SOURCES = $(i965_gen11_FILES)
libi965_gen11_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=110
noinst_LTLIBRARIES = \
libi965_dri.la \
$(I965_PERGEN_LIBS)

4
src/mesa/drivers/dri/i965/Makefile.sources
View file

@ -150,6 +150,10 @@ i965_gen10_FILES = \
genX_blorp_exec.c \
genX_state_upload.c
i965_gen11_FILES = \
genX_blorp_exec.c \
genX_state_upload.c
i965_oa_GENERATED_FILES = \
brw_oa_hsw.h \
brw_oa_hsw.c \

4
src/mesa/drivers/dri/i965/brw_blorp.c
View file

@ -106,6 +106,10 @@ brw_blorp_init(struct brw_context *brw)
case 10:
brw->blorp.exec = gen10_blorp_exec;
break;
case 11:
brw->blorp.exec = gen11_blorp_exec;
break;
default:
unreachable("Invalid gen");
}

2
src/mesa/drivers/dri/i965/brw_blorp.h
View file

@ -129,6 +129,8 @@ void gen9_blorp_exec(struct blorp_batch *batch,
const struct blorp_params *params);
void gen10_blorp_exec(struct blorp_batch *batch,
const struct blorp_params *params);
void gen11_blorp_exec(struct blorp_batch *batch,
const struct blorp_params *params);
#ifdef __cplusplus
} /* extern "C" */

1
src/mesa/drivers/dri/i965/brw_state.h
View file

@ -334,6 +334,7 @@ void gen75_init_atoms(struct brw_context *brw);
void gen8_init_atoms(struct brw_context *brw);
void gen9_init_atoms(struct brw_context *brw);
void gen10_init_atoms(struct brw_context *brw);
void gen11_init_atoms(struct brw_context *brw);
/* Memory Object Control State:
* Specifying zero for L3 means "uncached in L3", at least on Haswell

4
src/mesa/drivers/dri/i965/brw_state_upload.c
View file

@ -164,7 +164,9 @@ void brw_init_state( struct brw_context *brw )
brw_init_caches(brw);
if (devinfo->gen >= 10)
if (devinfo->gen >= 11)
gen11_init_atoms(brw);
else if (devinfo->gen >= 10)
gen10_init_atoms(brw);
else if (devinfo->gen >= 9)
gen9_init_atoms(brw);

2
src/mesa/drivers/dri/i965/meson.build
View file

@ -135,7 +135,7 @@ files_i965 = files(
)
i965_gen_libs = []
foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100']
foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110']
i965_gen_libs += static_library(
'libi965_gen@0@'.format(v),
['genX_blorp_exec.c', 'genX_state_upload.c', gen_xml_pack],