zink/kopper: don't use generated include in kopper interface

this causes build race conditions

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15830>

diff --git a/src/gallium/drivers/zink/zink_instance.py b/src/gallium/drivers/zink/zink_instance.py
index 632cf3c..8c37500 100644 (file)
--- 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 1d0b834..2adebcd 100644 (file)
--- 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 caf99c5..e020380 100644 (file)
--- 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"