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.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'video/out/opengl/context.c') diff --git a/video/out/opengl/context.c b/video/out/opengl/context.c index 85be3a0ace..cdaf6320cd 100644 --- a/video/out/opengl/context.c +++ b/video/out/opengl/context.c @@ -155,8 +155,7 @@ bool ra_gl_ctx_init(struct ra_ctx *ctx, GL *gl, struct ra_gl_ctx_params params) { struct ra_swapchain *sw = ctx->swapchain = talloc_ptrtype(NULL, sw); *sw = (struct ra_swapchain) { - .ctx = ctx, - .flip_v = !params.flipped, // OpenGL framebuffers are normally inverted + .ctx = ctx, }; struct priv *p = sw->priv = talloc_ptrtype(sw, p); @@ -266,11 +265,12 @@ struct mp_image *ra_gl_ctx_screenshot(struct ra_swapchain *sw) return screen; } -struct ra_tex *ra_gl_ctx_start_frame(struct ra_swapchain *sw) +bool ra_gl_ctx_start_frame(struct ra_swapchain *sw, struct ra_fbo *out_fbo) { struct priv *p = sw->priv; - - return p->wrapped_fb; + out_fbo->tex = p->wrapped_fb; + out_fbo->flip = !p->params.flipped; // OpenGL FBs are normally flipped + return true; } bool ra_gl_ctx_submit_frame(struct ra_swapchain *sw, const struct vo_frame *frame) -- cgit v1.2.3