diff options
authorAkemi <>2018-01-20 16:10:42 +0100
committerKevin Mitchell <>2018-01-20 14:43:49 -0800
commit828f38e10d184ad1081dc48da7981e7315d94055 (patch)
parentdb08e28304693c1b2e8cbfbad0c28c23c1a414d7 (diff)
video: change some remaining vo_opengl mentions to vo_gpu
9 files changed, 11 insertions, 11 deletions
diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt
index a648e67027..2c4b2341f0 100644
--- a/DOCS/tech-overview.txt
+++ b/DOCS/tech-overview.txt
@@ -177,13 +177,13 @@ video/out/:
Video output. They also create GUI windows and handle user input. In most
cases, the windowing code is shared among VOs, like x11_common.c for X11 and
w32_common.c for Windows. The VOs stand between frontend and windowing code.
- vo_opengl can pick a windowing system at runtime, e.g. the same binary can
+ vo_gpu can pick a windowing system at runtime, e.g. the same binary can
provide both X11 and Cocoa support on OSX.
VOs can be reconfigured at runtime. A vo_reconfig() call can change the video
resolution and format, without destroying the window.
- vo_opengl should be taken as reference.
+ vo_gpu should be taken as reference.
format.h/format.c define the uncompressed audio formats. (As well as some
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 234701131a..4660d813b5 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -64,7 +64,7 @@ static enum AVPixelFormat get_format_hwdec(struct AVCodecContext *avctx,
// Maximum number of surfaces the player wants to buffer.
// This number might require adjustment depending on whatever the player does;
-// for example, if vo_opengl increases the number of reference surfaces for
+// for example, if vo_gpu increases the number of reference surfaces for
// interpolation, this value has to be increased too.
diff --git a/video/mp_image.c b/video/mp_image.c
index 37a4a3cf02..4da576c400 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -65,7 +65,7 @@ static int mp_image_layout(int imgfmt, int w, int h, int stride_align,
// Note: for non-mod-2 4:2:0 YUV frames, we have to allocate an additional
// top/right border. This is needed for correct handling of such
- // images in filter and VO code (e.g. vo_vdpau or vo_opengl).
+ // images in filter and VO code (e.g. vo_vdpau or vo_gpu).
for (int n = 0; n < MP_MAX_PLANES; n++) {
int alloc_w = mp_chroma_div_up(w, desc.xs[n]);
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index 6e7b3ddf2b..727ae8254a 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -3344,7 +3344,7 @@ static bool test_fbo(struct gl_video *p, const struct ra_format *fmt)
// Return whether dumb-mode can be used without disabling any features.
-// Essentially, vo_opengl with mostly default settings will return true.
+// Essentially, vo_gpu with mostly default settings will return true.
static bool check_dumb_mode(struct gl_video *p)
struct gl_video_opts *o = &p->opts;
diff --git a/video/out/vo.c b/video/out/vo.c
index fa79d51739..562c6b048a 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -1190,7 +1190,7 @@ void vo_get_src_dst_rects(struct vo *vo, struct mp_rect *out_src,
// flip_page[_timed] will be called offset_us microseconds too early.
// (For vo_vdpau, which does its own timing.)
// num_req_frames set the requested number of requested vo_frame.frames.
-// (For vo_opengl interpolation.)
+// (For vo_gpu interpolation.)
void vo_set_queue_params(struct vo *vo, int64_t offset_us, int num_req_frames)
struct vo_internal *in = vo->in;
diff --git a/video/out/vo.h b/video/out/vo.h
index cc86a632e7..bf5995f722 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -65,7 +65,7 @@ enum mp_voctrl {
VOCTRL_SET_EQUALIZER, // struct voctrl_set_equalizer_args*
VOCTRL_GET_EQUALIZER, // struct voctrl_get_equalizer_args*
- /* private to vo_opengl */
+ /* private to vo_gpu */
// Redraw the image previously passed to draw_image() (basically, repeat
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index ada3fb805b..913e0f696a 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -1027,7 +1027,7 @@ static int preinit(struct vo *vo)
if (mp_vdpau_guess_if_emulated(vc->mpvdp)) {
MP_WARN(vo, "VDPAU is most likely emulated via VA-API.\n"
- "This is inefficient. Use --vo=opengl instead.\n");
+ "This is inefficient. Use --vo=gpu instead.\n");
// Mark everything as invalid first so uninit() can tell what has been
diff --git a/video/out/win_state.c b/video/out/win_state.c
index d6c8788615..f9fb0cab52 100644
--- a/video/out/win_state.c
+++ b/video/out/win_state.c
@@ -84,8 +84,8 @@ void vo_calc_window_geometry2(struct vo *vo, const struct mp_rect *screen,
*out_geo = (struct vo_win_geometry){0};
// The case of calling this function even though no video was configured
- // yet (i.e. vo->params==NULL) happens when vo_opengl creates a hidden
- // window in order to create an OpenGL context.
+ // yet (i.e. vo->params==NULL) happens when vo_gpu creates a hidden window
+ // in order to create a rendering context.
struct mp_image_params params = { .w = 320, .h = 200 };
if (vo->params)
params = *vo->params;
diff --git a/wscript b/wscript
index 741fe1e5a4..6610bdd14e 100644
--- a/wscript
+++ b/wscript
@@ -770,7 +770,7 @@ video_output_features = [
lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']),
- # We still need all OpenGL symbols, because the vo_opengl code is
+ # We still need all OpenGL symbols, because the vo_gpu code is
# generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
check_cc(lib="EGL", linkflags="-lGLESv2"),