From ad9abad220df96d2155f6825f158b7f6327b7ea8 Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 10 Jan 2022 13:30:41 -0800 Subject: Various fixes to gfx. (#2074) * Various gfx fixes. * Fixup. Co-authored-by: Yong He --- tools/gfx/d3d/d3d-util.cpp | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) (limited to 'tools/gfx/d3d/d3d-util.cpp') diff --git a/tools/gfx/d3d/d3d-util.cpp b/tools/gfx/d3d/d3d-util.cpp index a9e49bfd9..860649be4 100644 --- a/tools/gfx/d3d/d3d-util.cpp +++ b/tools/gfx/d3d/d3d-util.cpp @@ -166,7 +166,9 @@ D3D12_DEPTH_STENCILOP_DESC D3DUtil::translateStencilOpDesc(DepthStencilOpDesc de case Format::R8G8_UNORM: return DXGI_FORMAT_R8G8_UNORM; case Format::R8_UNORM: return DXGI_FORMAT_R8_UNORM; case Format::B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; + case Format::B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; case Format::B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case Format::B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; case Format::R16G16B16A16_SNORM: return DXGI_FORMAT_R16G16B16A16_SNORM; case Format::R16G16_SNORM: return DXGI_FORMAT_R16G16_SNORM; @@ -208,43 +210,6 @@ D3D12_DEPTH_STENCILOP_DESC D3DUtil::translateStencilOpDesc(DepthStencilOpDesc de } } -D3D12_RESOURCE_STATES D3DUtil::translateResourceState(ResourceState state) -{ - switch (state) - { - case ResourceState::Undefined: - return D3D12_RESOURCE_STATE_COMMON; - case ResourceState::ShaderResource: - return D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE | - D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE; - case ResourceState::UnorderedAccess: - return D3D12_RESOURCE_STATE_UNORDERED_ACCESS; - case ResourceState::RenderTarget: - return D3D12_RESOURCE_STATE_RENDER_TARGET; - case ResourceState::DepthRead: - return D3D12_RESOURCE_STATE_DEPTH_READ; - case ResourceState::DepthWrite: - return D3D12_RESOURCE_STATE_DEPTH_WRITE; - case ResourceState::Present: - return D3D12_RESOURCE_STATE_PRESENT; - case ResourceState::CopySource: - return D3D12_RESOURCE_STATE_COPY_SOURCE; - case ResourceState::CopyDestination: - return D3D12_RESOURCE_STATE_COPY_DEST; - case ResourceState::ResolveSource: - return D3D12_RESOURCE_STATE_RESOLVE_SOURCE; - case ResourceState::ResolveDestination: - return D3D12_RESOURCE_STATE_RESOLVE_DEST; -#if SLANG_GFX_HAS_DXR_SUPPORT - case ResourceState::AccelerationStructure: - return D3D12_RESOURCE_STATE_RAYTRACING_ACCELERATION_STRUCTURE; -#endif - default: - return D3D12_RESOURCE_STATE_COMMON; - } -} - - /* static */DXGI_FORMAT D3DUtil::calcResourceFormat(UsageType usage, Int usageFlags, DXGI_FORMAT format) { SLANG_UNUSED(usage); -- cgit v1.2.3