Commit 9602b711 authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf

hw:d3d11: move the filters code in hw/d3d11

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent ec0b3bc1
d3d11dir = $(pluginsdir)/d3d11 d3d11dir = $(pluginsdir)/d3d11
d3d11_LTLIBRARIES = d3d11_LTLIBRARIES =
libdirect3d11_deinterlace_plugin_la_SOURCES = video_output/win32/d3d11_deinterlace.c libdirect3d11_deinterlace_plugin_la_SOURCES = hw/d3d11/d3d11_deinterlace.c
libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d11_deinterlace_plugin_la_LIBADD = libdeinterlace_common.la libd3d11_common.la libdirect3d11_deinterlace_plugin_la_LIBADD = libdeinterlace_common.la libd3d11_common.la
if HAVE_WINSTORE if HAVE_WINSTORE
libdirect3d11_deinterlace_plugin_la_LIBADD += -ld3d11 libdirect3d11_deinterlace_plugin_la_LIBADD += -ld3d11
endif endif
libdirect3d11_adjust_plugin_la_SOURCES = video_output/win32/d3d11_adjust.c libdirect3d11_adjust_plugin_la_SOURCES = hw/d3d11/d3d11_adjust.c
libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d11_adjust_plugin_la_LIBADD = libd3d11_common.la libdirect3d11_adjust_plugin_la_LIBADD = libd3d11_common.la
if HAVE_WINSTORE if HAVE_WINSTORE
...@@ -20,7 +20,7 @@ d3d11_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_pl ...@@ -20,7 +20,7 @@ d3d11_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_pl
endif endif
# GPU/CPU converter # GPU/CPU converter
libd3d11_surface_plugin_la_SOURCES = video_chroma/d3d11_surface.c libd3d11_surface_plugin_la_SOURCES = hw/d3d11/d3d11_surface.c
libd3d11_surface_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la libd3d11_surface_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la
if HAVE_WINSTORE if HAVE_WINSTORE
libd3d11_surface_plugin_la_LIBADD += -ld3d11 libd3d11_surface_plugin_la_LIBADD += -ld3d11
......
...@@ -36,12 +36,12 @@ ...@@ -36,12 +36,12 @@
#include <assert.h> #include <assert.h>
#include "copy.h" #include "../../video_chroma/copy.h"
#include <windows.h> #include <windows.h>
#define COBJMACROS #define COBJMACROS
#include <d3d11.h> #include <d3d11.h>
#include "d3d11_fmt.h" #include "../../video_chroma/d3d11_fmt.h"
#ifdef ID3D11VideoContext_VideoProcessorBlt #ifdef ID3D11VideoContext_VideoProcessorBlt
#define CAN_PROCESSOR 1 #define CAN_PROCESSOR 1
......
...@@ -917,6 +917,7 @@ modules/hw/vdpau/deinterlace.c ...@@ -917,6 +917,7 @@ modules/hw/vdpau/deinterlace.c
modules/hw/vdpau/display.c modules/hw/vdpau/display.c
modules/hw/vdpau/sharpen.c modules/hw/vdpau/sharpen.c
modules/hw/vaapi/filters.c modules/hw/vaapi/filters.c
modules/hw/d3d11/d3d11_surface.c
modules/keystore/keychain.m modules/keystore/keychain.m
modules/lua/demux.c modules/lua/demux.c
modules/lua/intf.c modules/lua/intf.c
...@@ -1052,7 +1053,6 @@ modules/text_renderer/svg.c ...@@ -1052,7 +1053,6 @@ modules/text_renderer/svg.c
modules/text_renderer/tdummy.c modules/text_renderer/tdummy.c
modules/video_chroma/chain.c modules/video_chroma/chain.c
modules/video_chroma/cvpx.c modules/video_chroma/cvpx.c
modules/video_chroma/d3d11_surface.c
modules/video_chroma/dxa9.c modules/video_chroma/dxa9.c
modules/video_chroma/grey_yuv.c modules/video_chroma/grey_yuv.c
modules/video_chroma/i420_rgb16.c modules/video_chroma/i420_rgb16.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment