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

i965/cnl: Wire up Mesa build files for gen10

Browse source 
V2: Remove isl_gen10.c and isl_gen10.h

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Anuj Phogat 2017-05-11 14:18:52 -07:00
parent 2417d5ca19
commit e01c5a6824
5 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/intel/Makefile.isl.am
View file

@ -27,6 +27,7 @@ ISL_GEN_LIBS = \
isl/libisl-gen75.la \
isl/libisl-gen8.la \
isl/libisl-gen9.la \
isl/libisl-gen10.la \
$(NULL)
noinst_LTLIBRARIES += $(ISL_GEN_LIBS) isl/libisl.la
@ -55,6 +56,9 @@ isl_libisl_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80
isl_libisl_gen9_la_SOURCES = $(ISL_GEN9_FILES)
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
BUILT_SOURCES += $(ISL_GENERATED_FILES)
isl/isl_format_layout.c: isl/gen_format_layout.py \

10
src/intel/Makefile.sources
View file

@ -125,7 +125,8 @@ GENXML_XML_FILES = \
genxml/gen7.xml \
genxml/gen75.xml \
genxml/gen8.xml \
genxml/gen9.xml
genxml/gen9.xml \
genxml/gen10.xml
GENXML_GENERATED_PACK_FILES = \
genxml/gen4_pack.h \
@ -135,7 +136,8 @@ GENXML_GENERATED_PACK_FILES = \
genxml/gen7_pack.h \
genxml/gen75_pack.h \
genxml/gen8_pack.h \
genxml/gen9_pack.h
genxml/gen9_pack.h \
genxml/gen10_pack.h
GENXML_GENERATED_FILES = \
$(GENXML_GENERATED_PACK_FILES) \
@ -187,6 +189,10 @@ ISL_GEN9_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GEN10_FILES = \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c
ISL_GENERATED_FILES = \
isl/isl_format_layout.c

7
src/intel/Makefile.vulkan.am
View file

@ -72,7 +72,8 @@ VULKAN_PER_GEN_LIBS = \
vulkan/libanv-gen7.la \
vulkan/libanv-gen75.la \
vulkan/libanv-gen8.la \
vulkan/libanv-gen9.la
vulkan/libanv-gen9.la \
vulkan/libanv-gen10.la
noinst_LTLIBRARIES += $(VULKAN_PER_GEN_LIBS)
@ -107,6 +108,10 @@ vulkan_libanv_gen9_la_CFLAGS = $(VULKAN_CFLAGS)
vulkan_libanv_gen9_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=90
vulkan_libanv_gen9_la_SOURCES = $(VULKAN_GEN9_FILES)
vulkan_libanv_gen10_la_CFLAGS = $(VULKAN_CFLAGS)
vulkan_libanv_gen10_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=100
vulkan_libanv_gen10_la_SOURCES = $(VULKAN_GEN10_FILES)
VULKAN_SOURCES = \
$(VULKAN_GENERATED_FILES) \
$(VULKAN_FILES)

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

@ -53,7 +53,8 @@ I965_PERGEN_LIBS = \
libi965_gen7.la \
libi965_gen75.la \
libi965_gen8.la \
libi965_gen9.la
libi965_gen9.la \
libi965_gen10.la
libi965_gen4_la_SOURCES = $(i965_gen4_FILES)
libi965_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40
@ -79,6 +80,9 @@ libi965_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80
libi965_gen9_la_SOURCES = $(i965_gen9_FILES)
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
noinst_LTLIBRARIES = \
libi965_dri.la \
$(I965_PERGEN_LIBS)

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

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