From bcf514174c2d5b116102f362dba29367547df19f Mon Sep 17 00:00:00 2001 From: cristei <51248378+cristeigabriel@users.noreply.github.com> Date: Wed, 24 Nov 2021 01:37:57 +0200 Subject: [PATCH] Get rid of redundancies (#260) --- DirectXTex/DirectXTexD3D12.cpp | 14 +++----------- DirectXTex/DirectXTexWIC.cpp | 2 -- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/DirectXTex/DirectXTexD3D12.cpp b/DirectXTex/DirectXTexD3D12.cpp index 41961ed..fb7cf54 100644 --- a/DirectXTex/DirectXTexD3D12.cpp +++ b/DirectXTex/DirectXTexD3D12.cpp @@ -759,17 +759,9 @@ HRESULT DirectX::CaptureTexture( return E_FAIL; } - UINT arraySize, depth; - if (desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) - { - arraySize = 1; - depth = desc.DepthOrArraySize; - } - else - { - arraySize = desc.DepthOrArraySize; - depth = 1; - } + UINT arraySize = (desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + ? 1 + : desc.DepthOrArraySize; for (UINT plane = 0; plane < numberOfPlanes; ++plane) { diff --git a/DirectXTex/DirectXTexWIC.cpp b/DirectXTex/DirectXTexWIC.cpp index cabf63f..3e57f5e 100644 --- a/DirectXTex/DirectXTexWIC.cpp +++ b/DirectXTex/DirectXTexWIC.cpp @@ -361,8 +361,6 @@ namespace if (FAILED(hr)) return hr; - blobSize = mBlob.GetBufferSize(); - auto ptr = static_cast(mBlob.GetBufferPointer()); if (m_streamEOF < size.LowPart) {