From a277dbf1f43e2021e9cf9eef9f08e34abc799b55 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Mon, 18 Jul 2022 13:20:26 -0700 Subject: [PATCH] d3d12: Add a blank d3d12_resource_state.h/cpp This will host some code that's moving and ported to match style with the rest of the driver, and other code that will be re-written. Reviewed-by: Bill Kristiansen Part-of: --- .../drivers/d3d12/D3D12ResourceState.h | 7 +++-- .../drivers/d3d12/d3d12_resource_state.cpp | 25 ++++++++++++++++ .../drivers/d3d12/d3d12_resource_state.h | 29 +++++++++++++++++++ src/gallium/drivers/d3d12/meson.build | 1 + 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 src/gallium/drivers/d3d12/d3d12_resource_state.cpp create mode 100644 src/gallium/drivers/d3d12/d3d12_resource_state.h diff --git a/src/gallium/drivers/d3d12/D3D12ResourceState.h b/src/gallium/drivers/d3d12/D3D12ResourceState.h index 6312cd1ff04..f1bbc88eb20 100644 --- a/src/gallium/drivers/d3d12/D3D12ResourceState.h +++ b/src/gallium/drivers/d3d12/D3D12ResourceState.h @@ -21,8 +21,8 @@ * IN THE SOFTWARE. */ -#ifndef D3D12_RESOURCE_STATE_H -#define D3D12_RESOURCE_STATE_H +#ifndef D3D12RESOURCESTATE_H +#define D3D12RESOURCESTATE_H #include #include @@ -30,6 +30,7 @@ #include "util/list.h" #include "d3d12_common.h" +#include "d3d12_resource_state.h" #if defined(__GNUC__) #pragma GCC diagnostic ignored "-Winvalid-offsetof" @@ -291,4 +292,4 @@ private: UINT64 ExecutionId); }; -#endif // D3D12_RESOURCE_STATE_H +#endif // D3D12RESOURCESTATEH diff --git a/src/gallium/drivers/d3d12/d3d12_resource_state.cpp b/src/gallium/drivers/d3d12/d3d12_resource_state.cpp new file mode 100644 index 00000000000..535e74ba436 --- /dev/null +++ b/src/gallium/drivers/d3d12/d3d12_resource_state.cpp @@ -0,0 +1,25 @@ +/* + * Copyright © Microsoft Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "d3d12_resource_state.h" + diff --git a/src/gallium/drivers/d3d12/d3d12_resource_state.h b/src/gallium/drivers/d3d12/d3d12_resource_state.h new file mode 100644 index 00000000000..b35abb4b799 --- /dev/null +++ b/src/gallium/drivers/d3d12/d3d12_resource_state.h @@ -0,0 +1,29 @@ +/* + * Copyright © Microsoft Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef D3D12_RESOURCE_STATE_H +#define D3D12_RESOURCE_STATE_H + + + +#endif // D3D12_RESOURCE_STATE_H diff --git a/src/gallium/drivers/d3d12/meson.build b/src/gallium/drivers/d3d12/meson.build index 5dfd44924b7..2f09dc250f6 100644 --- a/src/gallium/drivers/d3d12/meson.build +++ b/src/gallium/drivers/d3d12/meson.build @@ -40,6 +40,7 @@ files_libd3d12 = files( 'd3d12_query.cpp', 'd3d12_residency.cpp', 'd3d12_resource.cpp', + 'd3d12_resource_state.cpp', 'd3d12_root_signature.cpp', 'd3d12_screen.cpp', 'd3d12_surface.cpp',