Commit 0e5c11fa authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf

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

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 9602b711
...@@ -2,17 +2,17 @@ d3d9dir = $(pluginsdir)/d3d9 ...@@ -2,17 +2,17 @@ d3d9dir = $(pluginsdir)/d3d9
d3d9_LTLIBRARIES = d3d9_LTLIBRARIES =
# GPU/CPU converter # GPU/CPU converter
libdxa9_plugin_la_SOURCES = video_chroma/dxa9.c libdxa9_plugin_la_SOURCES = hw/d3d9/dxa9.c
libdxa9_plugin_la_LIBADD = libd3d9_common.la libchroma_copy.la libdxa9_plugin_la_LIBADD = libd3d9_common.la libchroma_copy.la
if HAVE_AVCODEC_DXVA2 if HAVE_AVCODEC_DXVA2
d3d9_LTLIBRARIES += libdxa9_plugin.la d3d9_LTLIBRARIES += libdxa9_plugin.la
endif endif
libdirect3d9_deinterlace_plugin_la_SOURCES = video_output/win32/dxva2_deinterlace.c libdirect3d9_deinterlace_plugin_la_SOURCES = hw/d3d9/dxva2_deinterlace.c
libdirect3d9_deinterlace_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) libdeinterlace_common.la libdirect3d9_deinterlace_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) libdeinterlace_common.la
libdirect3d9_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libdirect3d9_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d9_adjust_plugin_la_SOURCES = video_output/win32/d3d9_adjust.c libdirect3d9_adjust_plugin_la_SOURCES = hw/d3d9/d3d9_adjust.c
libdirect3d9_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libdirect3d9_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d9_adjust_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) libdirect3d9_adjust_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM)
......
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
#include <vlc_picture.h> #include <vlc_picture.h>
#include <vlc_modules.h> #include <vlc_modules.h>
#include "copy.h" #include "../../video_chroma/copy.h"
#include <windows.h> #include <windows.h>
#include <d3d9.h> #include <d3d9.h>
#include "d3d9_fmt.h" #include "../../video_chroma/d3d9_fmt.h"
struct filter_sys_t { struct filter_sys_t {
/* GPU to CPU */ /* GPU to CPU */
......
...@@ -918,6 +918,7 @@ modules/hw/vdpau/display.c ...@@ -918,6 +918,7 @@ 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/hw/d3d11/d3d11_surface.c
modules/hw/d3d9/dxa9.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
...@@ -1053,7 +1054,6 @@ modules/text_renderer/svg.c ...@@ -1053,7 +1054,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/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
modules/video_chroma/i420_rgb8.c modules/video_chroma/i420_rgb8.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