diff options
author | Jordan Justen <jordan.l.justen@intel.com> | 2020-05-15 03:16:51 -0700 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-12-01 19:06:22 +0000 |
commit | cd3251d6bafaae13d5a2cf52c917ef4517fe0130 (patch) | |
tree | 32cf80b509e06d6a4dc0b353fb9c3152c399c1e2 /src/gallium/drivers/iris/iris_screen.c | |
parent | 3b953f0f7a672389b4a6a591efb94f5e1eca7c25 (diff) |
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>
Diffstat (limited to 'src/gallium/drivers/iris/iris_screen.c')
-rw-r--r-- | src/gallium/drivers/iris/iris_screen.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index d9b876ddb3b..0ee64c58385 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -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(); |