d3d12: Add header containing core features

... and include the single header instead of listing many ones Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
2024-12-27 18:50:48 +00:00 · 2023-12-26 17:26:55 +09:00 · 2023-12-26 17:26:55 +09:00 · 48cfca413d
commit 48cfca413d
parent 41d8a12649
21 changed files with 45 additions and 50 deletions
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12.h
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12.h
@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstd3d12_fwd.h"
+#include "gstd3d12bufferpool.h"
+#include "gstd3d12commandallocatorpool.h"
+#include "gstd3d12commandlistpool.h"
+#include "gstd3d12commandqueue.h"
+#include "gstd3d12descriptorpool.h"
+#include "gstd3d12device.h"
+#include "gstd3d12format.h"
+#include "gstd3d12memory.h"
+#include "gstd3d12utils.h"
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12basefilter.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12basefilter.cpp
@ -22,9 +22,6 @@
 #endif

 #include "gstd3d12basefilter.h"
-#include "gstd3d12device.h"
-#include "gstd3d12utils.h"
-#include "gstd3d12memory.h"

 GST_DEBUG_CATEGORY_STATIC (gst_d3d12_base_filter_debug);
 #define GST_CAT_DEFAULT gst_d3d12_base_filter_debug
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12basefilter.h
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12basefilter.h
@ -22,7 +22,7 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/base/gstbasetransform.h>
-#include "gstd3d12_fwd.h"
+#include "gstd3d12.h"

 G_BEGIN_DECLS

--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12bufferpool.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12bufferpool.cpp
@ -21,10 +21,8 @@
 #include "config.h"
 #endif

-#include "gstd3d12device.h"
-#include "gstd3d12bufferpool.h"
+#include "gstd3d12.h"
 #include "gstd3d12memory-private.h"
-#include "gstd3d12utils.h"
 #include <directx/d3dx12.h>

 GST_DEBUG_CATEGORY_STATIC (gst_d3d12_buffer_pool_debug);
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12commandallocatorpool.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12commandallocatorpool.cpp
@ -21,8 +21,7 @@
 #include "config.h"
 #endif

-#include "gstd3d12commandallocatorpool.h"
-#include "gstd3d12device.h"
+#include "gstd3d12.h"
 #include <wrl.h>
 #include <queue>
 #include <mutex>
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12commandlistpool.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12commandlistpool.cpp
@ -21,8 +21,7 @@
 #include "config.h"
 #endif

-#include "gstd3d12commandlistpool.h"
-#include "gstd3d12device.h"
+#include "gstd3d12.h"
 #include <wrl.h>
 #include <queue>
 #include <mutex>
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12commandqueue.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12commandqueue.cpp
@ -21,9 +21,7 @@
 #include "config.h"
 #endif

-#include "gstd3d12commandqueue.h"
-#include "gstd3d12device.h"
-#include "gstd3d12utils.h"
+#include "gstd3d12.h"
 #include <wrl.h>
 #include <queue>
 #include <mutex>
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12decoder.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12decoder.cpp
@ -23,11 +23,6 @@

 #include <directx/d3dx12.h>
 #include "gstd3d12decoder.h"
-#include "gstd3d12device.h"
-#include "gstd3d12utils.h"
-#include "gstd3d12format.h"
-#include "gstd3d12memory.h"
-#include "gstd3d12bufferpool.h"
 #include <gst/base/gstqueuearray.h>
 #include <wrl.h>
 #include <string.h>
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12decoder.h
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12decoder.h
@ -23,7 +23,7 @@
 #include <gst/video/video.h>
 #include <gst/codecs/gstcodecpicture.h>
 #include <gst/dxva/gstdxva.h>
-#include "gstd3d12_fwd.h"
+#include "gstd3d12.h"

 G_BEGIN_DECLS

--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12descriptorpool.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12descriptorpool.cpp
@ -21,8 +21,7 @@
 #include "config.h"
 #endif

-#include "gstd3d12descriptorpool.h"
-#include "gstd3d12device.h"
+#include "gstd3d12.h"
 #include <wrl.h>
 #include <queue>
 #include <mutex>
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12device.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12device.cpp
@ -21,12 +21,7 @@
 #include "config.h"
 #endif

-#include "gstd3d12device.h"
-#include "gstd3d12utils.h"
-#include "gstd3d12format.h"
-#include "gstd3d12commandlistpool.h"
-#include "gstd3d12commandallocatorpool.h"
-#include "gstd3d12commandqueue.h"
+#include "gstd3d12.h"
 #include <wrl.h>
 #include <vector>
 #include <string.h>
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12download.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12download.cpp
@ -22,8 +22,6 @@
 #endif

 #include "gstd3d12download.h"
-#include "gstd3d12bufferpool.h"
-#include "gstd3d12format.h"

 GST_DEBUG_CATEGORY_STATIC (gst_d3d12_download_debug);
 #define GST_CAT_DEFAULT gst_d3d12_download_debug
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12format.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12format.cpp
@ -21,9 +21,7 @@
 #include "config.h"
 #endif

-#include "gstd3d12format.h"
-#include "gstd3d12utils.h"
-#include "gstd3d12device.h"
+#include "gstd3d12.h"
 #include <string.h>

 GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_format_debug);
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12h264dec.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12h264dec.cpp
@ -37,8 +37,6 @@
 #endif

 #include "gstd3d12h264dec.h"
-#include "gstd3d12device.h"
-#include "gstd3d12utils.h"
 #include <gst/dxva/gstdxvah264decoder.h>

 GST_DEBUG_CATEGORY_STATIC (gst_d3d12_h264_dec_debug);
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12h265dec.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12h265dec.cpp
@ -37,8 +37,6 @@
 #endif

 #include "gstd3d12h265dec.h"
-#include "gstd3d12device.h"
-#include "gstd3d12utils.h"
 #include <gst/dxva/gstdxvah265decoder.h>

 GST_DEBUG_CATEGORY_STATIC (gst_d3d12_h265_dec_debug);
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12memory.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12memory.cpp
@ -21,12 +21,9 @@
 #include "config.h"
 #endif

-#include <directx/d3dx12.h>
-#include "gstd3d12memory.h"
+#include "gstd3d12.h"
 #include "gstd3d12memory-private.h"
-#include "gstd3d12device.h"
-#include "gstd3d12utils.h"
-#include "gstd3d12format.h"
+#include <directx/d3dx12.h>
 #include <string.h>
 #include <wrl.h>
 #include <mutex>
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12upload.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12upload.cpp
@ -22,8 +22,6 @@
 #endif

 #include "gstd3d12upload.h"
-#include "gstd3d12bufferpool.h"
-#include "gstd3d12format.h"

 GST_DEBUG_CATEGORY_STATIC (gst_d3d12_upload_debug);
 #define GST_CAT_DEFAULT gst_d3d12_upload_debug
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.cpp
@ -21,8 +21,7 @@
 #include "config.h"
 #endif

-#include "gstd3d12utils.h"
-#include "gstd3d12device.h"
+#include "gstd3d12.h"
 #include <mutex>

 /* *INDENT-OFF* */
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.h
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.h
@ -21,7 +21,6 @@

 #include <gst/gst.h>
 #include "gstd3d12_fwd.h"
-#include "gstd3d12device.h"

 G_BEGIN_DECLS

--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12vp9dec.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12vp9dec.cpp
@ -37,8 +37,6 @@
 #endif

 #include "gstd3d12vp9dec.h"
-#include "gstd3d12device.h"
-#include "gstd3d12utils.h"
 #include <gst/dxva/gstdxvavp9decoder.h>

 GST_DEBUG_CATEGORY_STATIC (gst_d3d12_vp9_dec_debug);
--- a/subprojects/gst-plugins-bad/sys/d3d12/plugin.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/plugin.cpp
@ -28,7 +28,7 @@
 #endif

 #include <gst/gst.h>
-#include "gstd3d12device.h"
+#include "gstd3d12.h"
 #include "gstd3d12download.h"
 #include "gstd3d12upload.h"
 #include "gstd3d12h264dec.h"