d3d12: Move the D3D12ResourceState code to the gallium driver
It's only used there, and we don't plan to use it in Dozen, so let's move the code to src/gallium/drivers/d3d12/ and get rid of the static d3d12_resource_state library. Suggested-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16042>
This commit is contained in:
parent
5c4906dc0f
commit
cf930db39c
|
@ -46,6 +46,7 @@ files_libd3d12 = files(
|
|||
'd3d12_screen.cpp',
|
||||
'd3d12_surface.cpp',
|
||||
'd3d12_tcs_variant.cpp',
|
||||
'D3D12ResourceState.cpp',
|
||||
)
|
||||
|
||||
if host_machine.system() == 'windows'
|
||||
|
@ -57,7 +58,7 @@ libd3d12 = static_library(
|
|||
files_libd3d12,
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux],
|
||||
dependencies: [idep_nir_headers, idep_libdxil_compiler, idep_libd3d12_resource_state, dep_dxheaders],
|
||||
dependencies: [idep_nir_headers, idep_libdxil_compiler, dep_dxheaders],
|
||||
)
|
||||
|
||||
driver_d3d12 = declare_dependency(
|
||||
|
|
|
@ -23,9 +23,6 @@ subdir('compiler')
|
|||
if with_microsoft_clc
|
||||
subdir('clc')
|
||||
endif
|
||||
if with_gallium_d3d12
|
||||
subdir('resource_state_manager')
|
||||
endif
|
||||
if with_spirv_to_dxil or with_microsoft_vk
|
||||
subdir('spirv_to_dxil')
|
||||
endif
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
# 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.
|
||||
|
||||
files_libd3d12_resource_state = files(
|
||||
'D3D12ResourceState.cpp',
|
||||
)
|
||||
|
||||
libd3d12_resource_state = static_library(
|
||||
'd3d12_resource_state',
|
||||
files_libd3d12_resource_state,
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mesa],
|
||||
dependencies: [dep_dxheaders],
|
||||
)
|
||||
|
||||
idep_libd3d12_resource_state = declare_dependency(
|
||||
link_with : [libd3d12_resource_state],
|
||||
include_directories : include_directories('.')
|
||||
)
|
Loading…
Reference in New Issue