From 2aff6f8c95b416a8da767c4ee2449b6d86d1d3b0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 30 Jun 2017 18:07:30 +0200 Subject: vo_direct3d: remove non-working nv12 shader support It never worked. It relied on some obscure texture format to provide the equivalent of GL_RG or GL_LUMINANCE_ALPHA, but no hardware seemed to report support for it ever. No idea what's the correct way to do this. On D3D11 it exists, of course. (Actually I'd like to remove the whole VO.) --- video/out/vo_direct3d.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'video/out/vo_direct3d.c') diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 9980a833c7..e18cf8e4e0 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -42,7 +42,6 @@ // shaders generated by fxc.exe from d3d_shader_yuv.hlsl #include "d3d_shader_420p.h" -#include "d3d_shader_nv12.h" #define IMGFMT_IS_Y(x) ((x) == IMGFMT_Y8 || (x) == IMGFMT_Y16) #define IMGFMT_Y_DEPTH(x) ((x) == IMGFMT_Y8 ? 8 : 16) @@ -110,7 +109,6 @@ struct osdpart { enum shaders { SHADER_NONE = 0, SHADER_420P, - SHADER_NV12, NUM_SHADERS }; @@ -216,8 +214,6 @@ static const struct fmt_entry fmt_table[] = { // grayscale (can be considered both packed and planar) {IMGFMT_Y8, D3DFMT_L8}, {IMGFMT_Y16, D3DFMT_L16}, - // 2 channels (needed for NV12 shader) - {IMGFMT_YA8, D3DFMT_A8L8}, {0}, }; @@ -747,7 +743,6 @@ static bool change_d3d_backbuffer(d3d_priv *priv) const DWORD* shaders[NUM_SHADERS] = { [SHADER_420P] = (DWORD *)d3d_shader_420p, - [SHADER_NV12] = (DWORD *)d3d_shader_nv12, }; for (int n = 0; n < NUM_SHADERS; n++) { @@ -1055,12 +1050,6 @@ static int check_shader_conversion(d3d_priv *priv, uint32_t fmt, return SHADER_420P; } } - if (fmt == IMGFMT_NV12) { - shader_d3dfmts[0] = check_format(priv, IMGFMT_Y8, true); - shader_d3dfmts[1] = check_format(priv, IMGFMT_YA8, true); - if (shader_d3dfmts[0] && shader_d3dfmts[1]) - return SHADER_NV12; - } return 0; } -- cgit v1.2.3