summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/render-test/circular-resource-heap-d3d12.cpp23
-rw-r--r--tools/render-test/d3d-util.cpp43
-rw-r--r--tools/render-test/render-d3d12.cpp8
-rw-r--r--tools/slang-test/README.md2
4 files changed, 47 insertions, 29 deletions
diff --git a/tools/render-test/circular-resource-heap-d3d12.cpp b/tools/render-test/circular-resource-heap-d3d12.cpp
index 7336c3e09..ae8e13822 100644
--- a/tools/render-test/circular-resource-heap-d3d12.cpp
+++ b/tools/render-test/circular-resource-heap-d3d12.cpp
@@ -24,17 +24,18 @@ void D3D12CircularResourceHeap::_freeBlockListResources(const Block* start)
{
if (start)
{
- {
- ID3D12Resource* resource = start->m_resource;
- resource->Unmap(0, nullptr);
- resource->Release();
- }
- for (Block* block = start->m_next; block != start; block = block->m_next)
- {
- ID3D12Resource* resource = block->m_resource;
- resource->Unmap(0, nullptr);
- resource->Release();
- }
+ const Block* block = start;
+ do
+ {
+ ID3D12Resource* resource = block->m_resource;
+
+ resource->Unmap(0, nullptr);
+ resource->Release();
+
+ // Next in list
+ block = block->m_next;
+
+ } while (block != start);
}
}
diff --git a/tools/render-test/d3d-util.cpp b/tools/render-test/d3d-util.cpp
index ff07fc2ea..09e0891f9 100644
--- a/tools/render-test/d3d-util.cpp
+++ b/tools/render-test/d3d-util.cpp
@@ -42,8 +42,11 @@ using namespace Slang;
{
switch (format)
{
- case DXGI_FORMAT_R32_FLOAT:
- case DXGI_FORMAT_D32_FLOAT: return DXGI_FORMAT_R32_TYPELESS;
+ case DXGI_FORMAT_R32_FLOAT: /* fallthru */
+ case DXGI_FORMAT_D32_FLOAT:
+ {
+ return DXGI_FORMAT_R32_TYPELESS;
+ }
case DXGI_FORMAT_D24_UNORM_S8_UINT: return DXGI_FORMAT_R24G8_TYPELESS;
default: break;
}
@@ -65,8 +68,11 @@ using namespace Slang;
{
switch (format)
{
- case DXGI_FORMAT_D32_FLOAT:
- case DXGI_FORMAT_R32_TYPELESS: return DXGI_FORMAT_D32_FLOAT;
+ case DXGI_FORMAT_D32_FLOAT: /* fallthru */
+ case DXGI_FORMAT_R32_TYPELESS:
+ {
+ return DXGI_FORMAT_D32_FLOAT;
+ }
case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: return DXGI_FORMAT_D24_UNORM_S8_UINT;
case DXGI_FORMAT_R24G8_TYPELESS: return DXGI_FORMAT_D24_UNORM_S8_UINT;
default: break;
@@ -77,8 +83,11 @@ using namespace Slang;
{
switch (format)
{
- case DXGI_FORMAT_D32_FLOAT:
- case DXGI_FORMAT_D24_UNORM_S8_UINT: return DXGI_FORMAT_UNKNOWN;
+ case DXGI_FORMAT_D32_FLOAT: /* fallthru */
+ case DXGI_FORMAT_D24_UNORM_S8_UINT:
+ {
+ return DXGI_FORMAT_UNKNOWN;
+ }
case DXGI_FORMAT_R32_TYPELESS: return DXGI_FORMAT_R32_FLOAT;
default: break;
}
@@ -88,8 +97,11 @@ using namespace Slang;
{
switch (format)
{
- case DXGI_FORMAT_D32_FLOAT:
- case DXGI_FORMAT_R32_TYPELESS: return DXGI_FORMAT_R32_FLOAT;
+ case DXGI_FORMAT_D32_FLOAT: /* fallthru */
+ case DXGI_FORMAT_R32_TYPELESS:
+ {
+ return DXGI_FORMAT_R32_FLOAT;
+ }
case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: return DXGI_FORMAT_R24_UNORM_X8_TYPELESS;
default: break;
}
@@ -149,22 +161,25 @@ bool D3DUtil::isTypeless(DXGI_FORMAT format)
case DXGI_FORMAT_R32G32B32_FLOAT:
case DXGI_FORMAT_R32G32B32_UINT:
case DXGI_FORMAT_R32G32B32_SINT:
+ {
return 32;
-
+ }
case DXGI_FORMAT_R16G16B16A16_TYPELESS:
case DXGI_FORMAT_R16G16B16A16_FLOAT:
case DXGI_FORMAT_R16G16B16A16_UNORM:
case DXGI_FORMAT_R16G16B16A16_UINT:
case DXGI_FORMAT_R16G16B16A16_SNORM:
case DXGI_FORMAT_R16G16B16A16_SINT:
+ {
return 16;
-
+ }
case DXGI_FORMAT_R10G10B10A2_TYPELESS:
case DXGI_FORMAT_R10G10B10A2_UNORM:
case DXGI_FORMAT_R10G10B10A2_UINT:
case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
+ {
return 10;
-
+ }
case DXGI_FORMAT_R8G8B8A8_TYPELESS:
case DXGI_FORMAT_R8G8B8A8_UNORM:
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
@@ -177,12 +192,14 @@ bool D3DUtil::isTypeless(DXGI_FORMAT format)
case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
case DXGI_FORMAT_B8G8R8X8_TYPELESS:
case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
+ {
return 8;
-
+ }
case DXGI_FORMAT_B5G6R5_UNORM:
case DXGI_FORMAT_B5G5R5A1_UNORM:
+ {
return 5;
-
+ }
case DXGI_FORMAT_B4G4R4A4_UNORM:
return 4;
diff --git a/tools/render-test/render-d3d12.cpp b/tools/render-test/render-d3d12.cpp
index 50ef6e575..8827816d9 100644
--- a/tools/render-test/render-d3d12.cpp
+++ b/tools/render-test/render-d3d12.cpp
@@ -193,7 +193,7 @@ protected:
{
virtual void setRootConstantBufferView(int index, D3D12_GPU_VIRTUAL_ADDRESS gpuBufferLocation) = 0;
virtual void setRootDescriptorTable(int index, D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor) = 0;
- virtual void setRootSigniture(ID3D12RootSignature* rootSignature) = 0;
+ virtual void setRootSignature(ID3D12RootSignature* rootSignature) = 0;
};
struct BindParameters
@@ -228,7 +228,7 @@ protected:
{
m_commandList->SetGraphicsRootDescriptorTable(index, baseDescriptor);
}
- void setRootSigniture(ID3D12RootSignature* rootSignature)
+ void setRootSignature(ID3D12RootSignature* rootSignature)
{
m_commandList->SetGraphicsRootSignature(rootSignature);
}
@@ -251,7 +251,7 @@ protected:
{
m_commandList->SetComputeRootDescriptorTable(index, baseDescriptor);
}
- void setRootSigniture(ID3D12RootSignature* rootSignature)
+ void setRootSignature(ID3D12RootSignature* rootSignature)
{
m_commandList->SetComputeRootSignature(rootSignature);
}
@@ -1415,7 +1415,7 @@ Result D3D12Renderer::_bindRenderState(RenderState* renderState, ID3D12GraphicsC
{
BindingStateImpl* bindingState = m_boundBindingState;
- submitter->setRootSigniture(renderState->m_rootSignature);
+ submitter->setRootSignature(renderState->m_rootSignature);
commandList->SetPipelineState(renderState->m_pipelineState);
{
diff --git a/tools/slang-test/README.md b/tools/slang-test/README.md
index f4418311d..819694b48 100644
--- a/tools/slang-test/README.md
+++ b/tools/slang-test/README.md
@@ -16,7 +16,7 @@ slang-test -bindir E:\slang\bin\windows-x64\Debug\\ -category full tests/compute
* The -category full means that all tests can be run.
* The final 'free parameter' is 'tests/compute/array-param' and means only tests starting with this string will run.
-It may also be necessary to have the working directory the root directory of the slang distribution - in the example about this would be "E:\slang\".
+It may also be necessary to have the working directory the root directory of the slang distribution - in the example above this would be "E:\slang\".
## Test Categories
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 16:30:53 +0000