diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-11-07 19:34:49 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-11-10 03:43:28 +0000 |
| commit | 0f35896a60c4de02ccfc91ace18bcef4450fa4d9 (patch) | |
| tree | 86a772a36c6c2258949231b756970a621b69f82b /Tests/IncludeTest | |
| parent | Corrected ray rtacing vertex format handling in D3D12 (diff) | |
| download | DiligentCore-0f35896a60c4de02ccfc91ace18bcef4450fa4d9.tar.gz DiligentCore-0f35896a60c4de02ccfc91ace18bcef4450fa4d9.zip | |
Added ability to update AS.
Diffstat (limited to 'Tests/IncludeTest')
9 files changed, 44 insertions, 11 deletions
diff --git a/Tests/IncludeTest/GraphicsEngine/BottomLevelASH_test.c b/Tests/IncludeTest/GraphicsEngine/BottomLevelASH_test.c index a10a32d1..4c5cf1a0 100644 --- a/Tests/IncludeTest/GraphicsEngine/BottomLevelASH_test.c +++ b/Tests/IncludeTest/GraphicsEngine/BottomLevelASH_test.c @@ -29,9 +29,15 @@ void TestBottomLevelAS_CInterface(IBottomLevelAS* pBLAS) { + Uint32 GeomDescIndex = IBottomLevelAS_GetGeometryDescIndex(pBLAS, "Name"); + (void)GeomDescIndex; + Uint32 GeomIndex = IBottomLevelAS_GetGeometryIndex(pBLAS, "Name"); (void)GeomIndex; + Uint32 GeomCount = IBottomLevelAS_GetActualGeometryCount(pBLAS); + (void)GeomCount; + ScratchBufferSizes ScratchSizes = IBottomLevelAS_GetScratchBufferSizes(pBLAS); (void)ScratchSizes; diff --git a/Tests/IncludeTest/GraphicsEngine/PipelineStateH_test.c b/Tests/IncludeTest/GraphicsEngine/PipelineStateH_test.c index 45e2a73c..cb9a9b65 100644 --- a/Tests/IncludeTest/GraphicsEngine/PipelineStateH_test.c +++ b/Tests/IncludeTest/GraphicsEngine/PipelineStateH_test.c @@ -26,3 +26,27 @@ */ #include "DiligentCore/Graphics/GraphicsEngine/interface/PipelineState.h" + +void TestPipelineState_CInterface(IPipelineState* pPSO) +{ + const GraphicsPipelineDesc* pGDesc = IPipelineState_GetGraphicsPipelineDesc(pPSO); + const RayTracingPipelineDesc* pRTDesc = IPipelineState_GetRayTracingPipelineDesc(pPSO); + (void)pGDesc; + (void)pRTDesc; + + IPipelineState_BindStaticResources(pPSO, (Uint32)0, (IResourceMapping*)NULL, (Uint32)1); + + Uint32 VarCount = IPipelineState_GetStaticVariableCount(pPSO, SHADER_TYPE_UNKNOWN); + IShaderResourceVariable* pSRV1 = IPipelineState_GetStaticVariableByName(pPSO, SHADER_TYPE_UNKNOWN, "Resource name"); + IShaderResourceVariable* pSRV2 = IPipelineState_GetStaticVariableByIndex(pPSO, SHADER_TYPE_UNKNOWN, (Uint32)1); + (void)VarCount; + (void)pSRV1; + (void)pSRV2; + + IPipelineState_CreateShaderResourceBinding(pPSO, (IShaderResourceBinding**)NULL, true); + + bool Compatible = IPipelineState_IsCompatibleWith(pPSO, (IPipelineState*)NULL); + Uint32 Index = IPipelineState_GetShaderGroupIndex(pPSO, "Group name"); + (void)Compatible; + (void)Index; +} diff --git a/Tests/IncludeTest/GraphicsEngine/ShaderBindingTableH_test.c b/Tests/IncludeTest/GraphicsEngine/ShaderBindingTableH_test.c index 955e92a1..a6714f15 100644 --- a/Tests/IncludeTest/GraphicsEngine/ShaderBindingTableH_test.c +++ b/Tests/IncludeTest/GraphicsEngine/ShaderBindingTableH_test.c @@ -29,15 +29,13 @@ void TestShaderBindingTable_CInterface(IShaderBindingTable* pSBT) { - IShaderBindingTable_Verify(pSBT); - - ShaderBindingTableDesc SBTDesc = {0}; - IShaderBindingTable_Reset(pSBT, &SBTDesc); - - IShaderBindingTable_ResetHitGroups(pSBT, 0); + IShaderBindingTable_Verify(pSBT, SHADER_BINDING_VALIDATION_ALL); + IShaderBindingTable_Reset(pSBT, (IPipelineState*)NULL); + IShaderBindingTable_ResetHitGroups(pSBT); IShaderBindingTable_BindRayGenShader(pSBT, "Group name", (const void*)NULL, 0); IShaderBindingTable_BindMissShader(pSBT, "Group name", 0, (const void*)NULL, 0); IShaderBindingTable_BindHitGroup(pSBT, (ITopLevelAS*)NULL, "Instance name", "Geometry name", 0, "Shader group name", (const void*)NULL, 0); + IShaderBindingTable_BindHitGroupForAll(pSBT, (ITopLevelAS*)NULL, 0, "Shader group name", (const void*)NULL, 0); IShaderBindingTable_BindHitGroups(pSBT, (ITopLevelAS*)NULL, "Instance name", 0, "Shader group name", (const void*)NULL, 0); IShaderBindingTable_BindCallableShader(pSBT, "Shader group name", 0, (const void*)NULL, 0); IShaderBindingTable_BindAll(pSBT, (BindAllAttribs*)NULL); diff --git a/Tests/IncludeTest/GraphicsEngine/TopLevelASH_test.c b/Tests/IncludeTest/GraphicsEngine/TopLevelASH_test.c index 3c70e3ee..f010eb83 100644 --- a/Tests/IncludeTest/GraphicsEngine/TopLevelASH_test.c +++ b/Tests/IncludeTest/GraphicsEngine/TopLevelASH_test.c @@ -32,6 +32,8 @@ void TestTopLevelAS_CInterface(ITopLevelAS* pTLAS) TLASInstanceDesc InstDesc = ITopLevelAS_GetInstanceDesc(pTLAS, "Name"); (void)InstDesc; + ITopLevelAS_GetContributionToHitGroupIndex(pTLAS, (Uint32*)NULL, (Uint32*)NULL); + ScratchBufferSizes ScratchSizes = ITopLevelAS_GetScratchBufferSizes(pTLAS); (void)ScratchSizes; diff --git a/Tests/IncludeTest/GraphicsEngineD3D12/PipelineStateD3D12H_test.c b/Tests/IncludeTest/GraphicsEngineD3D12/PipelineStateD3D12H_test.c index 1c3b90f6..f588ba39 100644 --- a/Tests/IncludeTest/GraphicsEngineD3D12/PipelineStateD3D12H_test.c +++ b/Tests/IncludeTest/GraphicsEngineD3D12/PipelineStateD3D12H_test.c @@ -31,7 +31,9 @@ void TestPipelineStateD3D12CInterface(struct IPipelineStateD3D12* pPSO) { ID3D12PipelineState* pd3d12PSO = IPipelineStateD3D12_GetD3D12PipelineState(pPSO); + ID3D12StateObject* pd3d12SO = IPipelineStateD3D12_GetD3D12StateObject(pPSO); ID3D12RootSignature* pd3d12RS = IPipelineStateD3D12_GetD3D12RootSignature(pPSO); (void)pd3d12PSO; + (void)pd3d12SO; (void)pd3d12RS; } diff --git a/Tests/IncludeTest/GraphicsEngineD3D12/RenderDeviceD3D12H_test.c b/Tests/IncludeTest/GraphicsEngineD3D12/RenderDeviceD3D12H_test.c index d6fa648a..06224ef7 100644 --- a/Tests/IncludeTest/GraphicsEngineD3D12/RenderDeviceD3D12H_test.c +++ b/Tests/IncludeTest/GraphicsEngineD3D12/RenderDeviceD3D12H_test.c @@ -43,4 +43,6 @@ void TestRenderDeviceD3D12CInterface(IRenderDeviceD3D12* pDevice) IRenderDeviceD3D12_CreateTextureFromD3DResource(pDevice, (ID3D12Resource*)NULL, RESOURCE_STATE_SHADER_RESOURCE, (ITexture**)NULL); IRenderDeviceD3D12_CreateBufferFromD3DResource(pDevice, (ID3D12Resource*)NULL, (BufferDesc*)NULL, RESOURCE_STATE_CONSTANT_BUFFER, (IBuffer**)NULL); + IRenderDeviceD3D12_CreateBLASFromD3DResource(pDevice, (ID3D12Resource*)NULL, (BottomLevelASDesc*)NULL, RESOURCE_STATE_BUILD_AS_READ, (IBottomLevelAS**)NULL); + IRenderDeviceD3D12_CreateTLASFromD3DResource(pDevice, (ID3D12Resource*)NULL, (TopLevelASDesc*)NULL, RESOURCE_STATE_BUILD_AS_READ, (ITopLevelAS**)NULL); } diff --git a/Tests/IncludeTest/GraphicsEngineD3D12/ShaderBindingTableD3D12H_test.c b/Tests/IncludeTest/GraphicsEngineD3D12/ShaderBindingTableD3D12H_test.c index 8f1e2cc2..ae52678d 100644 --- a/Tests/IncludeTest/GraphicsEngineD3D12/ShaderBindingTableD3D12H_test.c +++ b/Tests/IncludeTest/GraphicsEngineD3D12/ShaderBindingTableD3D12H_test.c @@ -27,8 +27,3 @@ #include <D3D12.h> #include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/ShaderBindingTableD3D12.h" - -void TestShaderBindingTableD3D12_CInterface(/*IShaderBindingTableD3D12* pSBTD3D12*/) -{ - /// AZ TODO -} diff --git a/Tests/IncludeTest/GraphicsEngineVk/BufferVkH_test.c b/Tests/IncludeTest/GraphicsEngineVk/BufferVkH_test.c index 4bfb1290..9e8b12de 100644 --- a/Tests/IncludeTest/GraphicsEngineVk/BufferVkH_test.c +++ b/Tests/IncludeTest/GraphicsEngineVk/BufferVkH_test.c @@ -35,4 +35,6 @@ void TestBufferVk_CInterface(IBufferVk* pView) IBufferVk_SetAccessFlags(pView, VK_ACCESS_HOST_READ_BIT); VkAccessFlags vkAccessFlag = IBufferVk_GetAccessFlags(pView); (void)vkAccessFlag; + VkDeviceAddress vkAddr = IBufferVk_GetVkDeviceAddress(pView); + (void)vkAddr; } diff --git a/Tests/IncludeTest/GraphicsEngineVk/RenderDeviceVkH_test.c b/Tests/IncludeTest/GraphicsEngineVk/RenderDeviceVkH_test.c index aa44951f..d91082cb 100644 --- a/Tests/IncludeTest/GraphicsEngineVk/RenderDeviceVkH_test.c +++ b/Tests/IncludeTest/GraphicsEngineVk/RenderDeviceVkH_test.c @@ -49,4 +49,6 @@ void TestRenderDeviceVkCInterface(IRenderDeviceVk* pDevice) IRenderDeviceVk_CreateTextureFromVulkanImage(pDevice, (VkImage)NULL, (TextureDesc*)NULL, RESOURCE_STATE_SHADER_RESOURCE, (ITexture**)NULL); IRenderDeviceVk_CreateBufferFromVulkanResource(pDevice, (VkBuffer)NULL, (BufferDesc*)NULL, RESOURCE_STATE_CONSTANT_BUFFER, (IBuffer**)NULL); + IRenderDeviceVk_CreateBLASFromVulkanResource(pDevice, (VkAccelerationStructureKHR)NULL, (BottomLevelASDesc*)NULL, RESOURCE_STATE_BUILD_AS_READ, (IBottomLevelAS**)NULL); + IRenderDeviceVk_CreateTLASFromVulkanResource(pDevice, (VkAccelerationStructureKHR)NULL, (TopLevelASDesc*)NULL, RESOURCE_STATE_BUILD_AS_READ, (ITopLevelAS**)NULL); } |
