summaryrefslogtreecommitdiffstats
path: root/tools/render-test/render-test-main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/render-test/render-test-main.cpp')
-rw-r--r--tools/render-test/render-test-main.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index e57e3917e..8f62d8a50 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -397,14 +397,13 @@ SlangResult _assignVarsFromLayout(
case ShaderInputType::Object:
{
auto typeName = entry.objectDesc.typeName;
- slang::TypeLayoutReflection* slangTypeLayout = nullptr;
+ slang::TypeReflection* slangType = nullptr;
if(typeName.getLength() != 0)
{
// If the input line specified the name of the type
// to allocate, then we use it directly.
//
- auto slangType = slangReflection->findTypeByName(typeName.getBuffer());
- slangTypeLayout = slangReflection->getTypeLayout(slangType);
+ slangType = slangReflection->findTypeByName(typeName.getBuffer());
}
else
{
@@ -412,7 +411,7 @@ SlangResult _assignVarsFromLayout(
// then we will infer the type from the type of the
// value pointed to by `entryCursor`.
//
- slangTypeLayout = entryCursor.getTypeLayout();
+ auto slangTypeLayout = entryCursor.getTypeLayout();
switch(slangTypeLayout->getKind())
{
default:
@@ -428,11 +427,11 @@ SlangResult _assignVarsFromLayout(
slangTypeLayout = slangTypeLayout->getElementTypeLayout();
break;
}
+ slangType = slangTypeLayout->getType();
}
- ComPtr<IShaderObjectLayout> shaderObjectLayout = renderer->createShaderObjectLayout(slangTypeLayout);
ComPtr<IShaderObject> shaderObject =
- renderer->createShaderObject(shaderObjectLayout);
+ renderer->createShaderObject(slangType);
entryCursor.setObject(shaderObject);
}