OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
this causes build race conditions

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15830>
This commit is contained in:
Mike Blumenkrantz
2022-04-08 16:32:40 -04:00
parent b6ddf8f0a4
commit 0bfb3b0436
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/zink/zink_instance.py
View File

@@ -112,7 +112,6 @@ void zink_stub_${cmd.lstrip("vk")}(void);
struct pipe_screen; struct pipe_screen;
struct pipe_resource; struct pipe_resource;
bool zink_kopper_update(struct pipe_screen *pscreen, struct pipe_resource *pres, int *w, int *h);
#endif #endif
""" """

3
src/gallium/drivers/zink/zink_kopper.h
View File

@@ -68,6 +68,7 @@ struct kopper_displaytarget
enum kopper_type type; enum kopper_type type;
}; };
struct zink_context;
struct zink_screen; struct zink_screen;
struct zink_resource; struct zink_resource;
@@ -106,4 +107,6 @@ bool
zink_kopper_present_readback(struct zink_context *ctx, struct zink_resource *res); zink_kopper_present_readback(struct zink_context *ctx, struct zink_resource *res);
void void
zink_kopper_deinit_displaytarget(struct zink_screen *screen, struct kopper_displaytarget *cdt); 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 #endif

2
src/gallium/frontends/dri/kopper.c
View File

@@ -30,7 +30,7 @@
#include "state_tracker/st_context.h" #include "state_tracker/st_context.h"
#include "os/os_process.h" #include "os/os_process.h"
#include "zink/zink_public.h" #include "zink/zink_public.h"
#include "zink/zink_instance.h" #include "zink/zink_kopper.h"
#include "driver_trace/tr_screen.h" #include "driver_trace/tr_screen.h"
#include "dri_screen.h" #include "dri_screen.h"