From 62ddc85d178e647e8cfbee6da4d173c661b4f1fc Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Wed, 20 Sep 2017 10:45:33 +0200 Subject: vo_gpu: simplify structs / names Due to the plethora of historical baggage from different eras getting confusing, I decided to simplify and unify the struct organization and naming scheme. Structs that got renamed: 1. fbodst -> ra_fbo (and moved to gpu/context.h) 2. fbotex -> removed (redundant after 2af2fa7a) 3. fbosurface -> surface 4. img_tex -> image In addition to these structs being renamed, all of the names have been made consistent. The new scheme is as follows: struct image img; struct ra_tex *tex; struct ra_fbo fbo; This also affects derived names, e.g. indirect_fbo -> indirect_tex. Notably also, finish_pass_fbo -> finish_pass_tex and finish_pass_direct -> finish_pass_fbo. The new equivalent of fbotex_change() is called ra_tex_resize(). This commit (should) contain no logic changes, just renaming a bunch of crap. --- video/out/opengl/context_vdpau.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/out/opengl/context_vdpau.c') diff --git a/video/out/opengl/context_vdpau.c b/video/out/opengl/context_vdpau.c index a2321f78dd..e9894142ea 100644 --- a/video/out/opengl/context_vdpau.c +++ b/video/out/opengl/context_vdpau.c @@ -336,7 +336,7 @@ uninit: return false; } -static struct ra_tex *vdpau_start_frame(struct ra_swapchain *sw) +static bool vdpau_start_frame(struct ra_swapchain *sw, struct ra_fbo *out_fbo) { struct priv *p = sw->ctx->priv; struct vo *vo = sw->ctx->vo; @@ -355,7 +355,7 @@ static struct ra_tex *vdpau_start_frame(struct ra_swapchain *sw) surf->mapped = true; ra_gl_ctx_resize(sw, surf->w, surf->h, surf->fbo); - return ra_gl_ctx_start_frame(sw); + return ra_gl_ctx_start_frame(sw, out_fbo); } static bool vdpau_submit_frame(struct ra_swapchain *sw, -- cgit v1.2.3