From f65d756bff8d4c5cbc15bd0322a2ae8e6b896a21 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 29 Oct 2024 14:49:26 +0800 Subject: format * format * Minor test fixes * enable checking cpp format in ci --- .../get-texture-resource-handle-test.cpp | 146 ++++++++++----------- 1 file changed, 69 insertions(+), 77 deletions(-) (limited to 'tools/gfx-unit-test/get-texture-resource-handle-test.cpp') diff --git a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp index 6b4862707..238d5a4fe 100644 --- a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp +++ b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp @@ -1,9 +1,8 @@ -#include "tools/unit-test/slang-unit-test.h" - -#include "slang-gfx.h" #include "gfx-test-util.h" -#include "tools/gfx-util/shader-cursor.h" +#include "slang-gfx.h" #include "source/core/slang-basic.h" +#include "tools/gfx-util/shader-cursor.h" +#include "tools/unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include @@ -13,90 +12,83 @@ using namespace gfx; namespace gfx_test { - void getTextureResourceHandleTestImpl(IDevice* device, UnitTestContext* context) - { - ITextureResource::Desc desc = {}; - desc.type = IResource::Type::Texture2D; - desc.numMipLevels = 1; - desc.size.width = 1; - desc.size.height = 1; - desc.size.depth = 1; - desc.defaultState = ResourceState::UnorderedAccess; - desc.format = Format::R16G16B16A16_FLOAT; +void getTextureResourceHandleTestImpl(IDevice* device, UnitTestContext* context) +{ + ITextureResource::Desc desc = {}; + desc.type = IResource::Type::Texture2D; + desc.numMipLevels = 1; + desc.size.width = 1; + desc.size.height = 1; + desc.size.depth = 1; + desc.defaultState = ResourceState::UnorderedAccess; + desc.format = Format::R16G16B16A16_FLOAT; - Slang::ComPtr buffer; - buffer = device->createTextureResource(desc); + Slang::ComPtr buffer; + buffer = device->createTextureResource(desc); - InteropHandle handle; - GFX_CHECK_CALL_ABORT(buffer->getNativeResourceHandle(&handle)); - if (device->getDeviceInfo().deviceType == gfx::DeviceType::Vulkan) - { - SLANG_CHECK(handle.handleValue != 0); - SLANG_CHECK(handle.api == InteropHandleAPI::Vulkan); - } + InteropHandle handle; + GFX_CHECK_CALL_ABORT(buffer->getNativeResourceHandle(&handle)); + if (device->getDeviceInfo().deviceType == gfx::DeviceType::Vulkan) + { + SLANG_CHECK(handle.handleValue != 0); + SLANG_CHECK(handle.api == InteropHandleAPI::Vulkan); + } #if SLANG_WINDOWS_FAMILY - else - { - SLANG_CHECK(handle.api == InteropHandleAPI::D3D12); - auto d3d12Handle = (ID3D12Resource*)handle.handleValue; - Slang::ComPtr testHandle1; - GFX_CHECK_CALL_ABORT(d3d12Handle->QueryInterface(testHandle1.writeRef())); - Slang::ComPtr testHandle2; - GFX_CHECK_CALL_ABORT(testHandle1->QueryInterface(testHandle2.writeRef())); - SLANG_CHECK(d3d12Handle == testHandle2.get()); - } -#endif + else + { + SLANG_CHECK(handle.api == InteropHandleAPI::D3D12); + auto d3d12Handle = (ID3D12Resource*)handle.handleValue; + Slang::ComPtr testHandle1; + GFX_CHECK_CALL_ABORT(d3d12Handle->QueryInterface(testHandle1.writeRef())); + Slang::ComPtr testHandle2; + GFX_CHECK_CALL_ABORT(testHandle1->QueryInterface(testHandle2.writeRef())); + SLANG_CHECK(d3d12Handle == testHandle2.get()); } +#endif +} - void getTextureResourceHandleTestAPI(UnitTestContext* context, Slang::RenderApiFlag::Enum api) +void getTextureResourceHandleTestAPI(UnitTestContext* context, Slang::RenderApiFlag::Enum api) +{ + if ((api & context->enabledApis) == 0) { - if ((api & context->enabledApis) == 0) - { - SLANG_IGNORE_TEST; - } - Slang::ComPtr device; - IDevice::Desc deviceDesc = {}; - switch (api) - { - case Slang::RenderApiFlag::D3D11: - deviceDesc.deviceType = gfx::DeviceType::DirectX11; - break; - case Slang::RenderApiFlag::D3D12: - deviceDesc.deviceType = gfx::DeviceType::DirectX12; - break; - case Slang::RenderApiFlag::Vulkan: - deviceDesc.deviceType = gfx::DeviceType::Vulkan; - break; - default: - SLANG_IGNORE_TEST; - } - deviceDesc.slang.slangGlobalSession = context->slangGlobalSession; - const char* searchPaths[] = { "", "../../tools/gfx-unit-test", "tools/gfx-unit-test" }; - deviceDesc.slang.searchPathCount = (SlangInt)SLANG_COUNT_OF(searchPaths); - deviceDesc.slang.searchPaths = searchPaths; - auto createDeviceResult = gfxCreateDevice(&deviceDesc, device.writeRef()); - if (SLANG_FAILED(createDeviceResult)) - { - SLANG_IGNORE_TEST; - } - // Ignore this test on swiftshader. Swiftshader seems to have a bug that causes the test - // to crash. - if (Slang::String(device->getDeviceInfo().adapterName).toLower().contains("swiftshader")) - { - SLANG_IGNORE_TEST; - } - getTextureResourceHandleTestImpl(device, context); + SLANG_IGNORE_TEST; } - - SLANG_UNIT_TEST(getTextureResourceHandleD3D12) + Slang::ComPtr device; + IDevice::Desc deviceDesc = {}; + switch (api) { - return getTextureResourceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::D3D12); + case Slang::RenderApiFlag::D3D11: deviceDesc.deviceType = gfx::DeviceType::DirectX11; break; + case Slang::RenderApiFlag::D3D12: deviceDesc.deviceType = gfx::DeviceType::DirectX12; break; + case Slang::RenderApiFlag::Vulkan: deviceDesc.deviceType = gfx::DeviceType::Vulkan; break; + default: SLANG_IGNORE_TEST; } - - SLANG_UNIT_TEST(getTextureResourceHandleVulkan) + deviceDesc.slang.slangGlobalSession = context->slangGlobalSession; + const char* searchPaths[] = {"", "../../tools/gfx-unit-test", "tools/gfx-unit-test"}; + deviceDesc.slang.searchPathCount = (SlangInt)SLANG_COUNT_OF(searchPaths); + deviceDesc.slang.searchPaths = searchPaths; + auto createDeviceResult = gfxCreateDevice(&deviceDesc, device.writeRef()); + if (SLANG_FAILED(createDeviceResult)) + { + SLANG_IGNORE_TEST; + } + // Ignore this test on swiftshader. Swiftshader seems to have a bug that causes the test + // to crash. + if (Slang::String(device->getDeviceInfo().adapterName).toLower().contains("swiftshader")) { - return getTextureResourceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::Vulkan); + SLANG_IGNORE_TEST; } + getTextureResourceHandleTestImpl(device, context); +} + +SLANG_UNIT_TEST(getTextureResourceHandleD3D12) +{ + return getTextureResourceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::D3D12); +} +SLANG_UNIT_TEST(getTextureResourceHandleVulkan) +{ + return getTextureResourceHandleTestAPI(unitTestContext, Slang::RenderApiFlag::Vulkan); } + +} // namespace gfx_test -- cgit v1.2.3