summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Justen <[email protected]>2019-02-10 20:14:07 -0800
committerJordan Justen <[email protected]>2019-08-28 13:38:33 -0700
commit44ab7c265fdb511077b120ee40c0d6af0125e276 (patch)
tree7a1e01aee3ce23e3d3dd8a913f8b0d48e5b80102
parent4d2e390a658f4a7dbe678a6329532c11eeb1a936 (diff)
iris: Build for gen12
Signed-off-by: Jordan Justen <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/gallium/drivers/iris/iris_context.c3
-rw-r--r--src/gallium/drivers/iris/iris_context.h3
-rw-r--r--src/gallium/drivers/iris/meson.build2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c
index 02b74d39619..11762cbebd2 100644
--- a/src/gallium/drivers/iris/iris_context.c
+++ b/src/gallium/drivers/iris/iris_context.c
@@ -214,6 +214,9 @@ iris_destroy_context(struct pipe_context *ctx)
#define genX_call(devinfo, func, ...) \
switch (devinfo->gen) { \
+ case 12: \
+ gen12_##func(__VA_ARGS__); \
+ break; \
case 11: \
gen11_##func(__VA_ARGS__); \
break; \
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h
index f65cfd1ca35..1fd6eb57cfe 100644
--- a/src/gallium/drivers/iris/iris_context.h
+++ b/src/gallium/drivers/iris/iris_context.h
@@ -938,6 +938,9 @@ void gen9_toggle_preemption(struct iris_context *ice,
# define genX(x) gen11_##x
# include "iris_genx_protos.h"
# undef genX
+# define genX(x) gen12_##x
+# include "iris_genx_protos.h"
+# undef genX
#endif
#endif
diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index 3f611c2b569..fde21c94e02 100644
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -62,7 +62,7 @@ iris_driinfo_h = custom_target(
)
iris_gen_libs = []
-foreach v : ['80', '90', '100', '110']
+foreach v : ['80', '90', '100', '110', '120']
iris_gen_libs += static_library(
'libiris_gen@0@'.format(v),
['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack],