GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 07:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

vo_opengl: move strictly private ra_gl structs to .c file

Browse Source 
So that nothing accidentally accesses these.
This commit is contained in:
wm4
2017-08-11 21:29:35 +02:00
parent 1a1f6e8581
commit de3eecce7f
2 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/opengl/ra_gl.c
+35
View File
@@ -6,6 +6,41 @@
static struct ra_fns ra_fns_gl;
// For ra.priv
struct ra_gl {
GL *gl;
bool debug_enable;
bool timer_active; // hack for GL_TIME_ELAPSED limitations
};
// For ra_tex.priv
struct ra_tex_gl {
bool own_objects;
GLenum target;
GLuint texture; // 0 if no texture data associated
GLuint fbo; // 0 if no rendering requested, or it default framebuffer
// These 3 fields can be 0 if unknown.
GLint internal_format;
GLenum format;
GLenum type;
struct gl_pbo_upload pbo;
};
// For ra_buf.priv
struct ra_buf_gl {
GLuint buffer;
GLsync fence;
};
// For ra_renderpass.priv
struct ra_renderpass_gl {
GLuint program;
// 1 entry for each ra_renderpass_params.inputs[] entry
GLint *uniform_loc;
int num_uniform_loc; // == ra_renderpass_params.num_inputs
struct gl_vao vao;
};
static int ra_init_gl(struct ra *ra, GL *gl)
{
if (gl->version < 210 && gl->es < 200) {
video/out/opengl/ra_gl.h
-35
View File
@@ -4,41 +4,6 @@
#include "ra.h"
#include "gl_utils.h"
// For ra.priv
struct ra_gl {
GL *gl;
bool debug_enable;
bool timer_active; // hack for GL_TIME_ELAPSED limitations
};
// For ra_tex.priv
struct ra_tex_gl {
bool own_objects;
GLenum target;
GLuint texture; // 0 if no texture data associated
GLuint fbo; // 0 if no rendering requested, or it default framebuffer
// These 3 fields can be 0 if unknown.
GLint internal_format;
GLenum format;
GLenum type;
struct gl_pbo_upload pbo;
};
// For ra_buf.priv
struct ra_buf_gl {
GLuint buffer;
GLsync fence;
};
// For ra_renderpass.priv
struct ra_renderpass_gl {
GLuint program;
// 1 entry for each ra_renderpass_params.inputs[] entry
GLint *uniform_loc;
int num_uniform_loc; // == ra_renderpass_params.num_inputs
struct gl_vao vao;
};
struct ra *ra_create_gl(GL *gl, struct mp_log *log);
struct ra_tex *ra_create_wrapped_tex(struct ra *ra,
const struct ra_tex_params *params,