[vlc-devel] [PATCH 03/20] hw:d3d11: move the filters code in hw/d3d11
Steve Lhomme
robux4 at videolabs.io
Wed Nov 22 18:18:22 CET 2017
---
modules/hw/d3d11/Makefile.am | 6 +++---
modules/{video_output/win32 => hw/d3d11}/d3d11_adjust.c | 0
modules/{video_output/win32 => hw/d3d11}/d3d11_deinterlace.c | 0
modules/{video_chroma => hw/d3d11}/d3d11_surface.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
rename modules/{video_output/win32 => hw/d3d11}/d3d11_adjust.c (100%)
rename modules/{video_output/win32 => hw/d3d11}/d3d11_deinterlace.c (100%)
rename modules/{video_chroma => hw/d3d11}/d3d11_surface.c (99%)
diff --git a/modules/hw/d3d11/Makefile.am b/modules/hw/d3d11/Makefile.am
index 8b777d2386..999d4c6052 100644
--- a/modules/hw/d3d11/Makefile.am
+++ b/modules/hw/d3d11/Makefile.am
@@ -1,13 +1,13 @@
d3d11dir = $(pluginsdir)/d3d11
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_LIBADD = libdeinterlace_common.la libd3d11_common.la
if HAVE_WINSTORE
libdirect3d11_deinterlace_plugin_la_LIBADD += -ld3d11
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_LIBADD = libd3d11_common.la
if HAVE_WINSTORE
@@ -20,7 +20,7 @@ d3d11_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_pl
endif
# 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
if HAVE_WINSTORE
libd3d11_surface_plugin_la_LIBADD += -ld3d11
diff --git a/modules/video_output/win32/d3d11_adjust.c b/modules/hw/d3d11/d3d11_adjust.c
similarity index 100%
rename from modules/video_output/win32/d3d11_adjust.c
rename to modules/hw/d3d11/d3d11_adjust.c
diff --git a/modules/video_output/win32/d3d11_deinterlace.c b/modules/hw/d3d11/d3d11_deinterlace.c
similarity index 100%
rename from modules/video_output/win32/d3d11_deinterlace.c
rename to modules/hw/d3d11/d3d11_deinterlace.c
diff --git a/modules/video_chroma/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
similarity index 99%
rename from modules/video_chroma/d3d11_surface.c
rename to modules/hw/d3d11/d3d11_surface.c
index b41b2fa5c7..ca79b224a3 100644
--- a/modules/video_chroma/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -36,12 +36,12 @@
#include <assert.h>
-#include "copy.h"
+#include "../../video_chroma/copy.h"
#include <windows.h>
#define COBJMACROS
#include <d3d11.h>
-#include "d3d11_fmt.h"
+#include "../../video_chroma/d3d11_fmt.h"
#ifdef ID3D11VideoContext_VideoProcessorBlt
#define CAN_PROCESSOR 1
--
2.14.2
More information about the vlc-devel
mailing list