vo_opengl: refactor into vo_gpu
This is done in several steps:
1. refactor MPGLContext -> struct ra_ctx
2. move GL-specific stuff in vo_opengl into opengl/context.c
3. generalize context creation to support other APIs, and add --gpu-api
4. rename all of the --opengl- options that are no longer opengl-specific
5. move all of the stuff from opengl/* that isn't GL-specific into gpu/
(note: opengl/gl_utils.h became opengl/utils.h)
6. rename vo_opengl to vo_gpu
7. to handle window screenshots, the short-term approach was to just add
it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to
ra itself (and vo_gpu altered to compensate), but this was a stop-gap
measure to prevent this commit from getting too big
8. move ra->fns->flush to ra_gl_ctx instead
9. some other minor changes that I've probably already forgotten
Note: This is one half of a major refactor, the other half of which is
provided by rossy's following commit. This commit enables support for
all linux platforms, while his version enables support for all non-linux
platforms.
Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the
--opengl- options like --opengl-early-flush, --opengl-finish etc. Should
be a strict superset of the old functionality.
Disclaimer: Since I have no way of compiling mpv on all platforms, some
of these ports were done blindly. Specifically, the blind ports included
context_mali_fbdev.c and context_rpi.c. Since they're both based on
egl_helpers, the port should have gone smoothly without any major
changes required. But if somebody complains about a compile error on
those platforms (assuming anybody actually uses them), you know where to
complain.
2017-09-14 06:04:55 +00:00
|
|
|
#pragma once
|
|
|
|
|
|
|
|
#include "video/out/vo.h"
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include "ra.h"
|
|
|
|
|
|
|
|
struct ra_ctx_opts {
|
|
|
|
int allow_sw; // allow software renderers
|
|
|
|
int want_alpha; // create an alpha framebuffer if possible
|
|
|
|
int debug; // enable debugging layers/callbacks etc.
|
|
|
|
bool probing; // the backend was auto-probed
|
|
|
|
int swapchain_depth; // max number of images to render ahead
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ra_ctx {
|
|
|
|
struct vo *vo;
|
|
|
|
struct ra *ra;
|
|
|
|
struct mpv_global *global;
|
|
|
|
struct mp_log *log;
|
|
|
|
|
|
|
|
struct ra_ctx_opts opts;
|
|
|
|
const struct ra_ctx_fns *fns;
|
|
|
|
struct ra_swapchain *swapchain;
|
|
|
|
|
|
|
|
void *priv;
|
|
|
|
};
|
|
|
|
|
|
|
|
// The functions that make up a ra_ctx.
|
|
|
|
struct ra_ctx_fns {
|
|
|
|
const char *type; // API type (for --gpu-api)
|
|
|
|
const char *name; // name (for --gpu-context)
|
|
|
|
|
|
|
|
// Resize the window, or create a new window if there isn't one yet.
|
|
|
|
// Currently, there is an unfortunate interaction with ctx->vo, and
|
|
|
|
// display size etc. are determined by it.
|
|
|
|
bool (*reconfig)(struct ra_ctx *ctx);
|
|
|
|
|
|
|
|
// This behaves exactly like vo_driver.control().
|
|
|
|
int (*control)(struct ra_ctx *ctx, int *events, int request, void *arg);
|
|
|
|
|
|
|
|
// These behave exactly like vo_driver.wakeup/wait_events. They are
|
|
|
|
// optional.
|
|
|
|
void (*wakeup)(struct ra_ctx *ctx);
|
|
|
|
void (*wait_events)(struct ra_ctx *ctx, int64_t until_time_us);
|
|
|
|
|
|
|
|
// Initialize/destroy the 'struct ra' and possibly the underlying VO backend.
|
|
|
|
// Not normally called by the user of the ra_ctx.
|
|
|
|
bool (*init)(struct ra_ctx *ctx);
|
|
|
|
void (*uninit)(struct ra_ctx *ctx);
|
|
|
|
};
|
|
|
|
|
|
|
|
// Extra struct for the swapchain-related functions so they can be easily
|
|
|
|
// inherited from helpers.
|
|
|
|
struct ra_swapchain {
|
|
|
|
struct ra_ctx *ctx;
|
|
|
|
struct priv *priv;
|
|
|
|
const struct ra_swapchain_fns *fns;
|
2017-09-20 08:45:33 +00:00
|
|
|
};
|
vo_opengl: refactor into vo_gpu
This is done in several steps:
1. refactor MPGLContext -> struct ra_ctx
2. move GL-specific stuff in vo_opengl into opengl/context.c
3. generalize context creation to support other APIs, and add --gpu-api
4. rename all of the --opengl- options that are no longer opengl-specific
5. move all of the stuff from opengl/* that isn't GL-specific into gpu/
(note: opengl/gl_utils.h became opengl/utils.h)
6. rename vo_opengl to vo_gpu
7. to handle window screenshots, the short-term approach was to just add
it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to
ra itself (and vo_gpu altered to compensate), but this was a stop-gap
measure to prevent this commit from getting too big
8. move ra->fns->flush to ra_gl_ctx instead
9. some other minor changes that I've probably already forgotten
Note: This is one half of a major refactor, the other half of which is
provided by rossy's following commit. This commit enables support for
all linux platforms, while his version enables support for all non-linux
platforms.
Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the
--opengl- options like --opengl-early-flush, --opengl-finish etc. Should
be a strict superset of the old functionality.
Disclaimer: Since I have no way of compiling mpv on all platforms, some
of these ports were done blindly. Specifically, the blind ports included
context_mali_fbdev.c and context_rpi.c. Since they're both based on
egl_helpers, the port should have gone smoothly without any major
changes required. But if somebody complains about a compile error on
those platforms (assuming anybody actually uses them), you know where to
complain.
2017-09-14 06:04:55 +00:00
|
|
|
|
2017-09-20 08:45:33 +00:00
|
|
|
// Represents a framebuffer / render target
|
|
|
|
struct ra_fbo {
|
|
|
|
struct ra_tex *tex;
|
|
|
|
bool flip; // rendering needs to be inverted
|
vo_opengl: refactor into vo_gpu
This is done in several steps:
1. refactor MPGLContext -> struct ra_ctx
2. move GL-specific stuff in vo_opengl into opengl/context.c
3. generalize context creation to support other APIs, and add --gpu-api
4. rename all of the --opengl- options that are no longer opengl-specific
5. move all of the stuff from opengl/* that isn't GL-specific into gpu/
(note: opengl/gl_utils.h became opengl/utils.h)
6. rename vo_opengl to vo_gpu
7. to handle window screenshots, the short-term approach was to just add
it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to
ra itself (and vo_gpu altered to compensate), but this was a stop-gap
measure to prevent this commit from getting too big
8. move ra->fns->flush to ra_gl_ctx instead
9. some other minor changes that I've probably already forgotten
Note: This is one half of a major refactor, the other half of which is
provided by rossy's following commit. This commit enables support for
all linux platforms, while his version enables support for all non-linux
platforms.
Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the
--opengl- options like --opengl-early-flush, --opengl-finish etc. Should
be a strict superset of the old functionality.
Disclaimer: Since I have no way of compiling mpv on all platforms, some
of these ports were done blindly. Specifically, the blind ports included
context_mali_fbdev.c and context_rpi.c. Since they're both based on
egl_helpers, the port should have gone smoothly without any major
changes required. But if somebody complains about a compile error on
those platforms (assuming anybody actually uses them), you know where to
complain.
2017-09-14 06:04:55 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ra_swapchain_fns {
|
|
|
|
// Gets the current framebuffer depth in bits (0 if unknown). Optional.
|
|
|
|
int (*color_depth)(struct ra_swapchain *sw);
|
|
|
|
|
2017-09-20 08:45:33 +00:00
|
|
|
// Retrieves a screenshot of the framebuffer. Optional.
|
vo_opengl: refactor into vo_gpu
This is done in several steps:
1. refactor MPGLContext -> struct ra_ctx
2. move GL-specific stuff in vo_opengl into opengl/context.c
3. generalize context creation to support other APIs, and add --gpu-api
4. rename all of the --opengl- options that are no longer opengl-specific
5. move all of the stuff from opengl/* that isn't GL-specific into gpu/
(note: opengl/gl_utils.h became opengl/utils.h)
6. rename vo_opengl to vo_gpu
7. to handle window screenshots, the short-term approach was to just add
it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to
ra itself (and vo_gpu altered to compensate), but this was a stop-gap
measure to prevent this commit from getting too big
8. move ra->fns->flush to ra_gl_ctx instead
9. some other minor changes that I've probably already forgotten
Note: This is one half of a major refactor, the other half of which is
provided by rossy's following commit. This commit enables support for
all linux platforms, while his version enables support for all non-linux
platforms.
Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the
--opengl- options like --opengl-early-flush, --opengl-finish etc. Should
be a strict superset of the old functionality.
Disclaimer: Since I have no way of compiling mpv on all platforms, some
of these ports were done blindly. Specifically, the blind ports included
context_mali_fbdev.c and context_rpi.c. Since they're both based on
egl_helpers, the port should have gone smoothly without any major
changes required. But if somebody complains about a compile error on
those platforms (assuming anybody actually uses them), you know where to
complain.
2017-09-14 06:04:55 +00:00
|
|
|
struct mp_image *(*screenshot)(struct ra_swapchain *sw);
|
|
|
|
|
|
|
|
// Called when rendering starts. Returns NULL on failure. This must be
|
2017-09-20 08:45:33 +00:00
|
|
|
// followed by submit_frame, to submit the rendered frame. This function
|
|
|
|
// can also fail sporadically, and such errors should be ignored unless
|
|
|
|
// they persist.
|
|
|
|
bool (*start_frame)(struct ra_swapchain *sw, struct ra_fbo *out_fbo);
|
vo_opengl: refactor into vo_gpu
This is done in several steps:
1. refactor MPGLContext -> struct ra_ctx
2. move GL-specific stuff in vo_opengl into opengl/context.c
3. generalize context creation to support other APIs, and add --gpu-api
4. rename all of the --opengl- options that are no longer opengl-specific
5. move all of the stuff from opengl/* that isn't GL-specific into gpu/
(note: opengl/gl_utils.h became opengl/utils.h)
6. rename vo_opengl to vo_gpu
7. to handle window screenshots, the short-term approach was to just add
it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to
ra itself (and vo_gpu altered to compensate), but this was a stop-gap
measure to prevent this commit from getting too big
8. move ra->fns->flush to ra_gl_ctx instead
9. some other minor changes that I've probably already forgotten
Note: This is one half of a major refactor, the other half of which is
provided by rossy's following commit. This commit enables support for
all linux platforms, while his version enables support for all non-linux
platforms.
Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the
--opengl- options like --opengl-early-flush, --opengl-finish etc. Should
be a strict superset of the old functionality.
Disclaimer: Since I have no way of compiling mpv on all platforms, some
of these ports were done blindly. Specifically, the blind ports included
context_mali_fbdev.c and context_rpi.c. Since they're both based on
egl_helpers, the port should have gone smoothly without any major
changes required. But if somebody complains about a compile error on
those platforms (assuming anybody actually uses them), you know where to
complain.
2017-09-14 06:04:55 +00:00
|
|
|
|
|
|
|
// Present the frame. Issued in lockstep with start_frame, with rendering
|
|
|
|
// commands in between. The `frame` is just there for timing data, for
|
|
|
|
// swapchains smart enough to do something with it.
|
|
|
|
bool (*submit_frame)(struct ra_swapchain *sw, const struct vo_frame *frame);
|
|
|
|
|
|
|
|
// Performs a buffer swap. This blocks for as long as necessary to meet
|
|
|
|
// params.swapchain_depth, or until the next vblank (for vsynced contexts)
|
|
|
|
void (*swap_buffers)(struct ra_swapchain *sw);
|
|
|
|
};
|
|
|
|
|
|
|
|
// Create and destroy a ra_ctx. This also takes care of creating and destroying
|
|
|
|
// the underlying `struct ra`, and perhaps the underlying VO backend.
|
|
|
|
struct ra_ctx *ra_ctx_create(struct vo *vo, const char *context_type,
|
|
|
|
const char *context_name, struct ra_ctx_opts opts);
|
|
|
|
void ra_ctx_destroy(struct ra_ctx **ctx);
|
|
|
|
|
|
|
|
struct m_option;
|
|
|
|
int ra_ctx_validate_api(struct mp_log *log, const struct m_option *opt,
|
|
|
|
struct bstr name, struct bstr param);
|
|
|
|
int ra_ctx_validate_context(struct mp_log *log, const struct m_option *opt,
|
|
|
|
struct bstr name, struct bstr param);
|