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.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/out/opengl/context.h') diff --git a/video/out/opengl/context.h b/video/out/opengl/context.h index bdf426b9b4..95ed374555 100644 --- a/video/out/opengl/context.h +++ b/video/out/opengl/context.h @@ -51,6 +51,6 @@ void ra_gl_ctx_resize(struct ra_swapchain *sw, int w, int h, int fbo); // for whatever reason, these can be used to inherit the original behavior. int ra_gl_ctx_color_depth(struct ra_swapchain *sw); struct mp_image *ra_gl_ctx_screenshot(struct ra_swapchain *sw); -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); bool ra_gl_ctx_submit_frame(struct ra_swapchain *sw, const struct vo_frame *frame); void ra_gl_ctx_swap_buffers(struct ra_swapchain *sw); -- cgit v1.2.3