From de3eecce7fabc23eb76558310040d54fd2528254 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 11 Aug 2017 10:29:56 +0200
Subject: vo_opengl: move strictly private ra_gl structs to .c file

So that nothing accidentally accesses these.
---
 video/out/opengl/ra_gl.c | 35 +++++++++++++++++++++++++++++++++++
 video/out/opengl/ra_gl.h | 35 -----------------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'video')

diff --git a/video/out/opengl/ra_gl.c b/video/out/opengl/ra_gl.c
index 78dde1091d..fbde3c81d4 100644
--- a/video/out/opengl/ra_gl.c
+++ b/video/out/opengl/ra_gl.c
@@ -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) {
diff --git a/video/out/opengl/ra_gl.h b/video/out/opengl/ra_gl.h
index 8707b423dd..e5e09a0197 100644
--- a/video/out/opengl/ra_gl.h
+++ b/video/out/opengl/ra_gl.h
@@ -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,
-- 
cgit v1.2.3