[vlc-commits] hw:d3d11: move the filters code in hw/d3d11

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Nov 22 18:18:22 2017 +0100| [9602b711f4c951f135dff54cb4191eb39ef1617e] | committer: Jean-Baptiste Kempf

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

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9602b711f4c951f135dff54cb4191eb39ef1617e
---

 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 ++--
 po/POTFILES.in                                               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5b4c5cbfc0..fa1728263b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -917,6 +917,7 @@ modules/hw/vdpau/deinterlace.c
 modules/hw/vdpau/display.c
 modules/hw/vdpau/sharpen.c
 modules/hw/vaapi/filters.c
+modules/hw/d3d11/d3d11_surface.c
 modules/keystore/keychain.m
 modules/lua/demux.c
 modules/lua/intf.c
@@ -1052,7 +1053,6 @@ modules/text_renderer/svg.c
 modules/text_renderer/tdummy.c
 modules/video_chroma/chain.c
 modules/video_chroma/cvpx.c
-modules/video_chroma/d3d11_surface.c
 modules/video_chroma/dxa9.c
 modules/video_chroma/grey_yuv.c
 modules/video_chroma/i420_rgb16.c