aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2018-11-18 13:29:42 -0800
committerJan Ekström <jeebjp@gmail.com>2018-11-18 23:50:38 +0200
commit721bec7dde976c128a6dd9dff111ab2cf5101c31 (patch)
tree2a8d23789ee02fde75d00a00d5a061a834acbd2e
parentedbe25f38a2d5867dec066288cb61adf6191f327 (diff)
vo_gpu: hwdec_cuda: Guard GL and Vulkan headers properly
We are currently unnecessarily including vulkan headers even when not building with vulkan support. I also guarded the GL header inclusion even though this doesn't appear to break anything today. Fixes #6330.
-rw-r--r--video/out/opengl/hwdec_cuda.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/video/out/opengl/hwdec_cuda.c b/video/out/opengl/hwdec_cuda.c
index af7ea6ca48..fee1f83f98 100644
--- a/video/out/opengl/hwdec_cuda.c
+++ b/video/out/opengl/hwdec_cuda.c
@@ -32,12 +32,17 @@
#include <libavutil/hwcontext_cuda.h>
#include "video/out/gpu/hwdec.h"
+#include "video/out/gpu/utils.h"
#include "formats.h"
#include "options/m_config.h"
+#if HAVE_GL
#include "ra_gl.h"
+#endif
+#if HAVE_VULKAN
#include "video/out/vulkan/formats.h"
#include "video/out/vulkan/ra_vk.h"
#include "video/out/vulkan/utils.h"
+#endif
#if HAVE_WIN32_DESKTOP
#include <versionhelpers.h>