Module: Mesa Branch: main Commit: 0bfb3b0436021ab20ee46bba2348d1a7c0b09207 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bfb3b0436021ab20ee46bba2348d1a7c0b09207
Author: Mike Blumenkrantz <[email protected]> Date: Fri Apr 8 16:32:40 2022 -0400 zink/kopper: don't use generated include in kopper interface this causes build race conditions Reviewed-by: Adam Jackson <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15830> --- src/gallium/drivers/zink/zink_instance.py | 1 - src/gallium/drivers/zink/zink_kopper.h | 3 +++ src/gallium/frontends/dri/kopper.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_instance.py b/src/gallium/drivers/zink/zink_instance.py index 632cf3c4bfc..8c37500f1c1 100644 --- a/src/gallium/drivers/zink/zink_instance.py +++ b/src/gallium/drivers/zink/zink_instance.py @@ -112,7 +112,6 @@ void zink_stub_${cmd.lstrip("vk")}(void); struct pipe_screen; struct pipe_resource; -bool zink_kopper_update(struct pipe_screen *pscreen, struct pipe_resource *pres, int *w, int *h); #endif """ diff --git a/src/gallium/drivers/zink/zink_kopper.h b/src/gallium/drivers/zink/zink_kopper.h index 1d0b834bca7..2adebcd0fee 100644 --- a/src/gallium/drivers/zink/zink_kopper.h +++ b/src/gallium/drivers/zink/zink_kopper.h @@ -68,6 +68,7 @@ struct kopper_displaytarget enum kopper_type type; }; +struct zink_context; struct zink_screen; struct zink_resource; @@ -106,4 +107,6 @@ bool zink_kopper_present_readback(struct zink_context *ctx, struct zink_resource *res); void zink_kopper_deinit_displaytarget(struct zink_screen *screen, struct kopper_displaytarget *cdt); +bool +zink_kopper_update(struct pipe_screen *pscreen, struct pipe_resource *pres, int *w, int *h); #endif diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index caf99c544b7..e02038075ec 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -30,7 +30,7 @@ #include "state_tracker/st_context.h" #include "os/os_process.h" #include "zink/zink_public.h" -#include "zink/zink_instance.h" +#include "zink/zink_kopper.h" #include "driver_trace/tr_screen.h" #include "dri_screen.h"
