diff options
| author | Philip Langdale <philipl@overt.org> | 2022-03-12 10:54:23 -0800 |
|---|---|---|
| committer | Philip Langdale <github.philipl@overt.org> | 2023-05-28 15:46:05 -0700 |
| commit | 085f3e31a091daf7d6649508b162cfcde826702a (patch) | |
| tree | 50eb9dc75c2c9071cad2b0e77baba4e97f1cb911 /video/out/gpu/hwdec.h | |
| parent | 959ef843d2752e802874b265b21ee6542388a019 (diff) | |
| download | mpv-085f3e31a091daf7d6649508b162cfcde826702a.tar.bz2 mpv-085f3e31a091daf7d6649508b162cfcde826702a.tar.xz | |
vo: hwdec: Pass the ra_ctx to hwdecs instead of just the ra
We will need the full ra_ctx to be able to look up all the state
required to initialise an ffmpeg vulkan hwcontext, so pass let's
pass the ra_ctx instead of just the ra.
Diffstat (limited to 'video/out/gpu/hwdec.h')
| -rw-r--r-- | video/out/gpu/hwdec.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/video/out/gpu/hwdec.h b/video/out/gpu/hwdec.h index 0dd2e14588..7766073e0c 100644 --- a/video/out/gpu/hwdec.h +++ b/video/out/gpu/hwdec.h @@ -2,6 +2,7 @@ #define MPGL_HWDEC_H_ #include "video/mp_image.h" +#include "context.h" #include "ra.h" #include "video/hwdec.h" @@ -10,7 +11,7 @@ struct ra_hwdec_ctx { // Set these before calling `ra_hwdec_ctx_init` struct mp_log *log; struct mpv_global *global; - struct ra *ra; + struct ra_ctx *ra_ctx; bool loading_done; struct ra_hwdec **hwdecs; @@ -38,7 +39,7 @@ struct ra_hwdec { const struct ra_hwdec_driver *driver; struct mp_log *log; struct mpv_global *global; - struct ra *ra; + struct ra_ctx *ra_ctx; struct mp_hwdec_devices *devs; // GLSL extensions required to sample textures from this. const char **glsl_extensions; @@ -131,7 +132,8 @@ struct ra_hwdec_driver { extern const struct ra_hwdec_driver *const ra_hwdec_drivers[]; -struct ra_hwdec *ra_hwdec_load_driver(struct ra *ra, struct mp_log *log, +struct ra_hwdec *ra_hwdec_load_driver(struct ra_ctx *ra_ctx, + struct mp_log *log, struct mpv_global *global, struct mp_hwdec_devices *devs, const struct ra_hwdec_driver *drv, |