summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-08-10 21:36:57 +0200
committerwm4 <wm4@nowhere>2017-08-10 21:36:57 +0200
commitfba4e8aa40824a7c503546fad78e63d2901ce004 (patch)
treeb1e802284cfb88b04d945fa160a5a02332dedc73 /video
parentc6fafbffaca16959dfa2b4bf1eb97861ad66b5ef (diff)
downloadmpv-fba4e8aa40824a7c503546fad78e63d2901ce004.tar.bz2
mpv-fba4e8aa40824a7c503546fad78e63d2901ce004.tar.xz
vo_opengl: remove some indirect GL header inclusions from core renderer
Diffstat (limited to 'video')
-rw-r--r--video/out/opengl/hwdec.h2
-rw-r--r--video/out/opengl/lcms.h1
-rw-r--r--video/out/opengl/user_shaders.h1
-rw-r--r--video/out/opengl/video.c3
-rw-r--r--video/out/opengl/video.h3
-rw-r--r--video/out/opengl/video_shaders.h1
6 files changed, 4 insertions, 7 deletions
diff --git a/video/out/opengl/hwdec.h b/video/out/opengl/hwdec.h
index f978b70018..20bbaae9eb 100644
--- a/video/out/opengl/hwdec.h
+++ b/video/out/opengl/hwdec.h
@@ -1,7 +1,7 @@
#ifndef MPGL_HWDEC_H_
#define MPGL_HWDEC_H_
-#include "common.h"
+#include "video/mp_image.h"
#include "ra.h"
#include "video/hwdec.h"
diff --git a/video/out/opengl/lcms.h b/video/out/opengl/lcms.h
index 20faa8dd5e..35bbd61fe0 100644
--- a/video/out/opengl/lcms.h
+++ b/video/out/opengl/lcms.h
@@ -4,6 +4,7 @@
#include <stddef.h>
#include <stdbool.h>
#include "misc/bstr.h"
+#include "video/csputils.h"
#include <libavutil/buffer.h>
extern const struct m_sub_options mp_icc_conf;
diff --git a/video/out/opengl/user_shaders.h b/video/out/opengl/user_shaders.h
index 065606165c..94a070c8e2 100644
--- a/video/out/opengl/user_shaders.h
+++ b/video/out/opengl/user_shaders.h
@@ -18,7 +18,6 @@
#ifndef MP_GL_USER_SHADERS_H
#define MP_GL_USER_SHADERS_H
-#include "common.h"
#include "utils.h"
#include "ra.h"
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index d118fe928d..8b1e29b936 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -31,13 +31,10 @@
#include "options/m_config.h"
#include "common/global.h"
#include "options/options.h"
-#include "common.h"
-#include "formats.h"
#include "utils.h"
#include "hwdec.h"
#include "osd.h"
#include "ra.h"
-#include "ra_gl.h"
#include "stream/stream.h"
#include "video_shaders.h"
#include "user_shaders.h"
diff --git a/video/out/opengl/video.h b/video/out/opengl/video.h
index a71f5d6b3d..84ddc0d47c 100644
--- a/video/out/opengl/video.h
+++ b/video/out/opengl/video.h
@@ -22,10 +22,10 @@
#include "options/m_option.h"
#include "sub/osd.h"
-#include "common.h"
#include "utils.h"
#include "lcms.h"
#include "shader_cache.h"
+#include "video/csputils.h"
#include "video/out/filter_kernels.h"
// Assume we have this many texture units for sourcing additional passes.
@@ -163,6 +163,7 @@ void gl_video_resize(struct gl_video *p,
struct mp_rect *src, struct mp_rect *dst,
struct mp_osd_res *osd);
void gl_video_set_fb_depth(struct gl_video *p, int fb_depth);
+struct voctrl_performance_data;
void gl_video_perfdata(struct gl_video *p, struct voctrl_performance_data *out);
struct mp_csp_equalizer;
struct mp_csp_equalizer *gl_video_eq_ptr(struct gl_video *p);
diff --git a/video/out/opengl/video_shaders.h b/video/out/opengl/video_shaders.h
index af59d9b678..f6edff6d2b 100644
--- a/video/out/opengl/video_shaders.h
+++ b/video/out/opengl/video_shaders.h
@@ -20,7 +20,6 @@
#include <libavutil/lfg.h>
-#include "common.h"
#include "utils.h"
#include "video.h"