Module: vkd3d Branch: master Commit: 332b250e82a16bd1f5d6eec7659a834604452ec2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=332b250e82a16bd1f5d6eec7...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Aug 1 18:10:58 2019 +0200
include: Move debug interfaces to vkd3d_d3d12sdklayers.h.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
Makefile.am | 2 ++ include/.gitignore | 1 + include/vkd3d_d3d12.idl | 24 ---------------------- include/vkd3d_d3d12sdklayers.idl | 43 ++++++++++++++++++++++++++++++++++++++++ tests/d3d12_crosstest.h | 1 + 5 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/Makefile.am b/Makefile.am index fe3a363..2b0e8f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ AM_LDFLAGS = -no-undefined
widl_headers = \ include/vkd3d_d3d12.h \ + include/vkd3d_d3d12sdklayers.h \ include/vkd3d_d3dcommon.h \ include/vkd3d_dxgi.h \ include/vkd3d_dxgi1_2.h \ @@ -17,6 +18,7 @@ widl_headers = \ vkd3d_public_headers = \ include/vkd3d.h \ include/vkd3d_d3d12.h \ + include/vkd3d_d3d12sdklayers.h \ include/vkd3d_d3dcommon.h \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ diff --git a/include/.gitignore b/include/.gitignore index d21fd99..7ed2b78 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -2,6 +2,7 @@ config.h config.h.in stamp-h1 vkd3d_d3d12.h +vkd3d_d3d12sdklayers.h vkd3d_d3dcommon.h vkd3d_dxgi.h vkd3d_dxgi1_2.h diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 067db8d..8489f56 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2319,30 +2319,6 @@ interface ID3D12Device1 : ID3D12Device }
[ - uuid(344488b7-6846-474b-b989-f027448245e0), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug : IUnknown -{ - void EnableDebugLayer(); -} - -[ - uuid(affaa4ca-63fe-4d8e-b8ad-159000af4304), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug1 : IUnknown -{ - void EnableDebugLayer(); - void SetEnableGPUBasedValidation(BOOL enable); - void SetEnableSynchronizedCommandQueueValidation(BOOL enable); -} - -[ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, local, diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl new file mode 100644 index 0000000..7663462 --- /dev/null +++ b/include/vkd3d_d3d12sdklayers.idl @@ -0,0 +1,43 @@ +/* + * 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 "vkd3d_d3d12.idl"; + +[ + uuid(344488b7-6846-474b-b989-f027448245e0), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug : IUnknown +{ + void EnableDebugLayer(); +} + +[ + uuid(affaa4ca-63fe-4d8e-b8ad-159000af4304), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug1 : IUnknown +{ + void EnableDebugLayer(); + void SetEnableGPUBasedValidation(BOOL enable); + void SetEnableSynchronizedCommandQueueValidation(BOOL enable); +} diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 1f7e764..7b59471 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -45,6 +45,7 @@ typedef int HRESULT; #include "vkd3d_windows.h" #define WIDL_C_INLINE_WRAPPERS #include "vkd3d_d3d12.h" +#include "vkd3d_d3d12sdklayers.h"
#include <inttypes.h> #include <limits.h>