From 99f2a5cd9fa363d659acabc9440b44f8dd38b51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
Date: Fri, 2 Oct 2020 19:25:59 +0330
Subject: [PATCH] include: Move the ID3D12Debug interface to
 d3d12sdklayers.idl.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/d3d12/tests/d3d12.c   |  1 +
 dlls/dxgi/tests/dxgi.c     |  1 +
 include/Makefile.in        |  1 +
 include/d3d12.idl          | 11 -----------
 include/d3d12sdklayers.idl | 30 ++++++++++++++++++++++++++++++
 5 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 include/d3d12sdklayers.idl

diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c
index 8c57f07357c..f5a4c2ba11e 100644
--- a/dlls/d3d12/tests/d3d12.c
+++ b/dlls/d3d12/tests/d3d12.c
@@ -21,6 +21,7 @@
 #define COBJMACROS
 #include "initguid.h"
 #include "d3d12.h"
+#include "d3d12sdklayers.h"
 #include "dxgi1_6.h"
 #include "wine/test.h"
 
diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c
index ce1aee5ee3b..bee21638430 100644
--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -24,6 +24,7 @@
 #include "dxgi1_6.h"
 #include "d3d11.h"
 #include "d3d12.h"
+#include "d3d12sdklayers.h"
 #include "winternl.h"
 #include "ddk/d3dkmthk.h"
 #include "wine/heap.h"
diff --git a/include/Makefile.in b/include/Makefile.in
index 91a02645c33..10a9bd7aa81 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -110,6 +110,7 @@ SOURCES = \
 	d3d11sdklayers.idl \
 	d3d11shader.h \
 	d3d12.idl \
+	d3d12sdklayers.idl \
 	d3d12shader.idl \
 	d3d8.h \
 	d3d8caps.h \
diff --git a/include/d3d12.idl b/include/d3d12.idl
index 201e01f07ef..8b1e85fcefe 100644
--- a/include/d3d12.idl
+++ b/include/d3d12.idl
@@ -2138,17 +2138,6 @@ interface ID3D12Device : ID3D12Object
     LUID GetAdapterLuid();
 }
 
-[
-    uuid(344488b7-6846-474b-b989-f027448245e0),
-    object,
-    local,
-    pointer_default(unique)
-]
-interface ID3D12Debug : IUnknown
-{
-    void EnableDebugLayer();
-}
-
 [
     uuid(34ab647b-3cc8-46ac-841b-c0965645c046),
     object,
diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl
new file mode 100644
index 00000000000..dfbb7382174
--- /dev/null
+++ b/include/d3d12sdklayers.idl
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016-2019 Józef Kucia for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ */
+
+import "d3d12.idl";
+
+[
+    uuid(344488b7-6846-474b-b989-f027448245e0),
+    object,
+    local,
+    pointer_default(unique)
+]
+interface ID3D12Debug : IUnknown
+{
+    void EnableDebugLayer();
+}