summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-12-07 14:04:43 +0100
committerwm4 <wm4@nowhere>2019-12-07 14:04:43 +0100
commit16b9c4c952168f2fd16dc9511d06ee3ea638a1b6 (patch)
treee8caa57bb3a4136881b98472e375823a9367d96a
parent3cabd11f9b46c8f7ec6f80e8f75b3c3012118ad8 (diff)
downloadmpv-16b9c4c952168f2fd16dc9511d06ee3ea638a1b6.tar.bz2
mpv-16b9c4c952168f2fd16dc9511d06ee3ea638a1b6.tar.xz
vo_gpu: hwdec_vaapi_gl: do not include eglext.h
Adding an ifdef mess to deal with insufficient system headers is kind of a mess. It's easier to just provide the definitions manually. This sucks a bit too, but it's the approach we've been using with OpenGL headers in general, and I think that worked pretty well.
-rw-r--r--video/out/hwdec/hwdec_vaapi_gl.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/video/out/hwdec/hwdec_vaapi_gl.c b/video/out/hwdec/hwdec_vaapi_gl.c
index 261099a248..f256028d5a 100644
--- a/video/out/hwdec/hwdec_vaapi_gl.c
+++ b/video/out/hwdec/hwdec_vaapi_gl.c
@@ -19,18 +19,12 @@
#include "hwdec_vaapi.h"
#include <EGL/egl.h>
-#include <EGL/eglext.h>
#include "video/out/opengl/ra_gl.h"
-#ifndef GL_OES_EGL_image
typedef void* GLeglImageOES;
-#endif
-#ifndef EGL_KHR_image
typedef void *EGLImageKHR;
-#endif
// Any EGL_EXT_image_dma_buf_import definitions used in this source file.
-#ifndef EGL_LINUX_DMA_BUF_EXT
#define EGL_LINUX_DMA_BUF_EXT 0x3270
#define EGL_LINUX_DRM_FOURCC_EXT 0x3271
#define EGL_DMA_BUF_PLANE0_FD_EXT 0x3272
@@ -42,14 +36,11 @@ typedef void *EGLImageKHR;
#define EGL_DMA_BUF_PLANE2_FD_EXT 0x3278
#define EGL_DMA_BUF_PLANE2_OFFSET_EXT 0x3279
#define EGL_DMA_BUF_PLANE2_PITCH_EXT 0x327A
-#endif
// Any EGL_EXT_image_dma_buf_import definitions used in this source file.
-#ifndef EGL_DMA_BUF_PLANE3_FD_EXT
#define EGL_DMA_BUF_PLANE3_FD_EXT 0x3440
#define EGL_DMA_BUF_PLANE3_OFFSET_EXT 0x3441
#define EGL_DMA_BUF_PLANE3_PITCH_EXT 0x3442
-#endif
struct vaapi_gl_mapper_priv {
GLuint gl_textures[4];