diff options
| author | wm4 <wm4@nowhere> | 2017-02-17 16:45:28 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-02-17 17:08:37 +0100 |
| commit | e59e917e71d6e2220f5a6f751f604516ab3e6008 (patch) | |
| tree | 1b520f0acf64fb422cd08411ebb7c165ade827d6 /video/vt.c | |
| parent | 91a2ddfdd775a4db02c6fe32d7c348a479bb5d9e (diff) | |
| download | mpv-e59e917e71d6e2220f5a6f751f604516ab3e6008.tar.bz2 mpv-e59e917e71d6e2220f5a6f751f604516ab3e6008.tar.xz | |
vo_opengl: hwdec_osx: use new format setup function
We can drop the custom table.
For some reason, the interop does not accept GL_RGB_RAW_422_APPLE as
internal format for GL_RGB_422_APPLE, so switch the format table to use
GL_RGB (this way both interop and real textures work the same).
Another victim of the apparent requirement of exactly matching texture
formats is kCVPixelFormatType_32BGRA. vo_opengl wants to handle this as
normal RGBA texture, with a swizzle applied in the shader.
CGLTexImageIOSurface2D() rejects this, because it wants the exact
internal format. Just drop the format, because it's useless anyway.
(Maybe this is a bit too fragile...)
Diffstat (limited to 'video/vt.c')
| -rw-r--r-- | video/vt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/video/vt.c b/video/vt.c index f0804d38a0..8488256399 100644 --- a/video/vt.c +++ b/video/vt.c @@ -9,7 +9,6 @@ static const uint32_t map_imgfmt_cvpixfmt[][2] = { {IMGFMT_420P, kCVPixelFormatType_420YpCbCr8Planar}, {IMGFMT_UYVY, kCVPixelFormatType_422YpCbCr8}, - {IMGFMT_BGR0, kCVPixelFormatType_32BGRA}, {IMGFMT_NV12, kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange}, {0} }; |