summaryrefslogtreecommitdiffstats
path: root/tools/render-test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/render-test')
-rw-r--r--tools/render-test/options.cpp24
-rw-r--r--tools/render-test/render-test-main.cpp27
-rw-r--r--tools/render-test/shader-input-layout.cpp19
-rw-r--r--tools/render-test/shader-renderer-util.cpp20
-rw-r--r--tools/render-test/slang-support.cpp23
5 files changed, 80 insertions, 33 deletions
diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp
index 68efacca3..beacad1a8 100644
--- a/tools/render-test/options.cpp
+++ b/tools/render-test/options.cpp
@@ -25,14 +25,22 @@ static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType)
using namespace Slang;
switch (apiType)
{
- case RenderApiType::D3D11: return rhi::DeviceType::D3D11;
- case RenderApiType::D3D12: return rhi::DeviceType::D3D12;
- case RenderApiType::Vulkan: return rhi::DeviceType::Vulkan;
- case RenderApiType::Metal: return rhi::DeviceType::Metal;
- case RenderApiType::CPU: return rhi::DeviceType::CPU;
- case RenderApiType::CUDA: return rhi::DeviceType::CUDA;
- case RenderApiType::WebGPU: return rhi::DeviceType::WGPU;
- default: return rhi::DeviceType::Default;
+ case RenderApiType::D3D11:
+ return rhi::DeviceType::D3D11;
+ case RenderApiType::D3D12:
+ return rhi::DeviceType::D3D12;
+ case RenderApiType::Vulkan:
+ return rhi::DeviceType::Vulkan;
+ case RenderApiType::Metal:
+ return rhi::DeviceType::Metal;
+ case RenderApiType::CPU:
+ return rhi::DeviceType::CPU;
+ case RenderApiType::CUDA:
+ return rhi::DeviceType::CUDA;
+ case RenderApiType::WebGPU:
+ return rhi::DeviceType::WGPU;
+ default:
+ return rhi::DeviceType::Default;
}
}
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index a36121af0..7afc5cb54 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -195,7 +195,8 @@ struct AssignValsFromLayoutContext
dataCursor = dataCursor.getDereferenced();
break;
- default: break;
+ default:
+ break;
}
SLANG_RETURN_ON_FAIL(dataCursor.setData(srcVal->bufferData.getBuffer(), bufferSize));
@@ -376,7 +377,8 @@ struct AssignValsFromLayoutContext
auto slangTypeLayout = dstCursor.getTypeLayout();
switch (slangTypeLayout->getKind())
{
- default: break;
+ default:
+ break;
case slang::TypeReflection::Kind::ConstantBuffer:
case slang::TypeReflection::Kind::ParameterBlock:
@@ -483,7 +485,9 @@ struct AssignValsFromLayoutContext
return assignAccelerationStructure(
dstCursor,
(ShaderInputLayout::AccelerationStructureVal*)srcVal.Ptr());
- default: assert(!"Unhandled type"); return SLANG_FAIL;
+ default:
+ assert(!"Unhandled type");
+ return SLANG_FAIL;
}
}
};
@@ -541,7 +545,8 @@ Result RenderTestApp::applyBinding(PipelineType pipelineType, IPassEncoder* enco
setProjectionMatrix(rootObject);
}
break;
- default: throw "unknown pipeline type";
+ default:
+ throw "unknown pipeline type";
}
return SLANG_OK;
}
@@ -589,7 +594,9 @@ SlangResult RenderTestApp::initialize(
{
switch (m_options.shaderType)
{
- default: assert(!"unexpected test shader type"); return SLANG_FAIL;
+ default:
+ assert(!"unexpected test shader type");
+ return SLANG_FAIL;
case Options::ShaderProgramType::Compute:
{
@@ -1280,7 +1287,9 @@ static SlangResult _innerMain(
slangPassThrough = SLANG_PASS_THROUGH_NONE;
break;
- default: fprintf(stderr, "error: unexpected\n"); return SLANG_FAIL;
+ default:
+ fprintf(stderr, "error: unexpected\n");
+ return SLANG_FAIL;
}
switch (options.inputLanguageID)
@@ -1295,7 +1304,8 @@ static SlangResult _innerMain(
input.passThrough = slangPassThrough;
break;
- default: break;
+ default:
+ break;
}
if (options.sourceLanguage != SLANG_SOURCE_LANGUAGE_UNKNOWN)
@@ -1337,7 +1347,8 @@ static SlangResult _innerMain(
// As long as we have CPU, then this should work
return spSessionCheckPassThroughSupport(session, SLANG_PASS_THROUGH_GENERIC_C_CPP);
}
- default: break;
+ default:
+ break;
}
}
diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp
index e2cf25809..25bfb58cf 100644
--- a/tools/render-test/shader-input-layout.cpp
+++ b/tools/render-test/shader-input-layout.cpp
@@ -531,7 +531,8 @@ struct ShaderInputLayoutParser
break;
case TokenType::IntLiteral:
- case TokenType::DoubleLiteral: return parseNumericValExpr(parser);
+ case TokenType::DoubleLiteral:
+ return parseNumericValExpr(parser);
case TokenType::LBrace:
{
@@ -1454,15 +1455,23 @@ void generateTextureDataRGB8(TextureData& output, const InputTextureDesc& inputD
case SLANG_SCALAR_TYPE_UINT64:
case SLANG_SCALAR_TYPE_UINT32:
case SLANG_SCALAR_TYPE_UINT16:
- case SLANG_SCALAR_TYPE_UINT8: type = SimpleScalarType::kUint; break;
+ case SLANG_SCALAR_TYPE_UINT8:
+ type = SimpleScalarType::kUint;
+ break;
case SLANG_SCALAR_TYPE_INT64:
case SLANG_SCALAR_TYPE_INT32:
case SLANG_SCALAR_TYPE_INT16:
- case SLANG_SCALAR_TYPE_INT8: type = SimpleScalarType::kInt; break;
+ case SLANG_SCALAR_TYPE_INT8:
+ type = SimpleScalarType::kInt;
+ break;
case SLANG_SCALAR_TYPE_FLOAT64:
case SLANG_SCALAR_TYPE_FLOAT32:
- case SLANG_SCALAR_TYPE_FLOAT16: type = SimpleScalarType::kFloat; break;
- default: type = SimpleScalarType::kUint; break;
+ case SLANG_SCALAR_TYPE_FLOAT16:
+ type = SimpleScalarType::kFloat;
+ break;
+ default:
+ type = SimpleScalarType::kUint;
+ break;
}
// List<List<unsigned int>>& dataBuffer = output.dataBuffer;
int arraySize = arrLen;
diff --git a/tools/render-test/shader-renderer-util.cpp b/tools/render-test/shader-renderer-util.cpp
index 37e5e9e2a..73921fef7 100644
--- a/tools/render-test/shader-renderer-util.cpp
+++ b/tools/render-test/shader-renderer-util.cpp
@@ -28,14 +28,17 @@ inline int calcMaxDimension(Extents size, TextureType type)
{
switch (type)
{
- case TextureType::Texture1D: return size.width;
- case TextureType::Texture3D: return Math::Max(Math::Max(size.width, size.height), size.depth);
+ case TextureType::Texture1D:
+ return size.width;
+ case TextureType::Texture3D:
+ return Math::Max(Math::Max(size.width, size.height), size.depth);
case TextureType::TextureCube: // fallthru
case TextureType::Texture2D:
{
return Math::Max(size.width, size.height);
}
- default: return 0;
+ default:
+ return 0;
}
}
@@ -77,9 +80,14 @@ inline int calcNumMipLevels(TextureType type, Extents size)
textureDesc.usage = TextureUsage::CopyDestination | TextureUsage::CopySource;
switch (defaultState)
{
- case ResourceState::ShaderResource: textureDesc.usage |= TextureUsage::ShaderResource; break;
- case ResourceState::UnorderedAccess: textureDesc.usage |= TextureUsage::UnorderedAccess; break;
- default: return SLANG_FAIL;
+ case ResourceState::ShaderResource:
+ textureDesc.usage |= TextureUsage::ShaderResource;
+ break;
+ case ResourceState::UnorderedAccess:
+ textureDesc.usage |= TextureUsage::UnorderedAccess;
+ break;
+ default:
+ return SLANG_FAIL;
}
textureDesc.defaultState = defaultState;
diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp
index 924a19104..368ee0390 100644
--- a/tools/render-test/slang-support.cpp
+++ b/tools/render-test/slang-support.cpp
@@ -121,7 +121,9 @@ void ShaderCompilerUtil::Output::reset()
case SLANG_SOURCE_LANGUAGE_HLSL:
spAddPreprocessorDefine(slangRequest, "__HLSL__", "1");
break;
- case SLANG_SOURCE_LANGUAGE_C: spAddPreprocessorDefine(slangRequest, "__C__", "1"); break;
+ case SLANG_SOURCE_LANGUAGE_C:
+ spAddPreprocessorDefine(slangRequest, "__C__", "1");
+ break;
case SLANG_SOURCE_LANGUAGE_CPP:
spAddPreprocessorDefine(slangRequest, "__CPP__", "1");
break;
@@ -132,7 +134,9 @@ void ShaderCompilerUtil::Output::reset()
spAddPreprocessorDefine(slangRequest, "__WGSL__", "1");
break;
- default: assert(!"unexpected"); break;
+ default:
+ assert(!"unexpected");
+ break;
}
if (input.passThrough != SLANG_PASS_THROUGH_NONE)
@@ -316,8 +320,11 @@ void ShaderCompilerUtil::Output::reset()
switch (input.passThrough)
{
case SLANG_PASS_THROUGH_DXC:
- case SLANG_PASS_THROUGH_FXC: canUseSlangForPrecompile = true; break;
- default: break;
+ case SLANG_PASS_THROUGH_FXC:
+ canUseSlangForPrecompile = true;
+ break;
+ default:
+ break;
}
// If we are doing a HLSL pass-through compilation, then we can't rely
// on the downstream compiler for the reflection information that
@@ -419,10 +426,14 @@ void ShaderCompilerUtil::Output::reset()
// Default the amount of renderTargets based on shader type
switch (shaderType)
{
- default: layout.numRenderTargets = 1; break;
+ default:
+ layout.numRenderTargets = 1;
+ break;
case Options::ShaderProgramType::Compute:
- case Options::ShaderProgramType::RayTracing: layout.numRenderTargets = 0; break;
+ case Options::ShaderProgramType::RayTracing:
+ layout.numRenderTargets = 0;
+ break;
}
// Deterministic random generator
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 21:56:23 +0000