From 80bfa52139976bd51b43c58e9576d379fe9f8a14 Mon Sep 17 00:00:00 2001 From: assiduous Date: Thu, 12 Dec 2019 14:41:17 -0800 Subject: Updated submodules (added unit tests). Reworked TestApp --- .../src/TestCreateObjFromNativeResD3D11.cpp | 109 --------------------- 1 file changed, 109 deletions(-) delete mode 100644 Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp (limited to 'Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp') diff --git a/Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp b/Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp deleted file mode 100644 index 4d913a6..0000000 --- a/Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* Copyright 2019 Diligent Graphics LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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 OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#include "pch.h" -#include "TestCreateObjFromNativeResD3D11.h" - -#include -#include "RenderDeviceD3D11.h" -#include "TextureD3D11.h" -#include "BufferD3D11.h" - -using namespace Diligent; - -void TestCreateObjFromNativeResD3D11::CreateTexture(Diligent::ITexture *pTexture) -{ - RefCntAutoPtr pDeviceD3D11(m_pDevice, IID_RenderDeviceD3D11); - const auto &SrcTexDesc = pTexture->GetDesc(); - RefCntAutoPtr pTextureD3D11(pTexture, IID_TextureD3D11); - auto *pd3d11Texture = pTextureD3D11->GetD3D11Texture(); - RefCntAutoPtr pTextureFromNativeD3D11Handle; - if (SrcTexDesc.Type == RESOURCE_DIM_TEX_1D || SrcTexDesc.Type == RESOURCE_DIM_TEX_1D_ARRAY) - { - pDeviceD3D11->CreateTextureFromD3DResource(static_cast(pd3d11Texture), RESOURCE_STATE_UNKNOWN, &pTextureFromNativeD3D11Handle); - ++m_NumTexturesCreated; - } - else if (SrcTexDesc.Type == RESOURCE_DIM_TEX_2D || SrcTexDesc.Type == RESOURCE_DIM_TEX_2D_ARRAY || - SrcTexDesc.Type == RESOURCE_DIM_TEX_CUBE || SrcTexDesc.Type == RESOURCE_DIM_TEX_CUBE_ARRAY) - { - pDeviceD3D11->CreateTextureFromD3DResource(static_cast(pd3d11Texture), RESOURCE_STATE_UNKNOWN, &pTextureFromNativeD3D11Handle); - ++m_NumTexturesCreated; - } - else if (SrcTexDesc.Type == RESOURCE_DIM_TEX_3D) - { - pDeviceD3D11->CreateTextureFromD3DResource(static_cast(pd3d11Texture), RESOURCE_STATE_UNKNOWN, &pTextureFromNativeD3D11Handle); - ++m_NumTexturesCreated; - } - else - { - UNEXPECTED("Unexpected texture dimensions"); - } - - auto TestTexDesc = pTextureFromNativeD3D11Handle->GetDesc(); - if (SrcTexDesc.Type == RESOURCE_DIM_TEX_CUBE || SrcTexDesc.Type == RESOURCE_DIM_TEX_CUBE_ARRAY) - { - VERIFY_EXPR(TestTexDesc.Type == RESOURCE_DIM_TEX_2D_ARRAY); - TestTexDesc.Type = SrcTexDesc.Type; - } - VERIFY_EXPR(TestTexDesc == SrcTexDesc); - RefCntAutoPtr pTestTextureD3D11(pTextureFromNativeD3D11Handle, IID_TextureD3D11); - VERIFY_EXPR(pTestTextureD3D11->GetD3D11Texture() == pd3d11Texture); - VERIFY_EXPR(pTestTextureD3D11->GetNativeHandle() == pd3d11Texture); -} - -void TestCreateObjFromNativeResD3D11::CreateBuffer(Diligent::IBuffer *pBuffer) -{ - RefCntAutoPtr pDeviceD3D11(m_pDevice, IID_RenderDeviceD3D11); - const auto &SrcBuffDesc = pBuffer->GetDesc(); - RefCntAutoPtr pBufferD3D11(pBuffer, IID_BufferD3D11); - auto *pd3d11Buffer = pBufferD3D11->GetD3D11Buffer(); - - { - RefCntAutoPtr pBufferFromNativeD3D11Handle; - pDeviceD3D11->CreateBufferFromD3DResource(pd3d11Buffer, SrcBuffDesc, RESOURCE_STATE_UNKNOWN, &pBufferFromNativeD3D11Handle); - ++m_NumBuffersCreated; - - const auto &TestBufferDesc = pBufferFromNativeD3D11Handle->GetDesc(); - VERIFY_EXPR(TestBufferDesc == SrcBuffDesc); - - RefCntAutoPtr pTestBufferD3D11(pBufferFromNativeD3D11Handle, IID_BufferD3D11); - VERIFY_EXPR(pTestBufferD3D11->GetD3D11Buffer() == pd3d11Buffer); - VERIFY_EXPR(pTestBufferD3D11->GetNativeHandle() == pd3d11Buffer); - } - - { - BufferDesc BuffDesc; - BuffDesc.Name = "Test buffer from D3D11 buffer"; - BuffDesc.ElementByteStride = SrcBuffDesc.ElementByteStride; - RefCntAutoPtr pBufferFromNativeD3D11Handle; - pDeviceD3D11->CreateBufferFromD3DResource(pd3d11Buffer, BuffDesc, RESOURCE_STATE_UNKNOWN, &pBufferFromNativeD3D11Handle); - ++m_NumBuffersCreated; - - const auto &TestBufferDesc = pBufferFromNativeD3D11Handle->GetDesc(); - VERIFY_EXPR(TestBufferDesc == SrcBuffDesc); - - RefCntAutoPtr pTestBufferD3D11(pBufferFromNativeD3D11Handle, IID_BufferD3D11); - VERIFY_EXPR(pTestBufferD3D11->GetD3D11Buffer() == pd3d11Buffer); - VERIFY_EXPR(pTestBufferD3D11->GetNativeHandle() == pd3d11Buffer); - } -} -- cgit v1.2.3