Skip to content

Commit ad7a4af

Browse files
committed
Address Copilot review comments
- Set CATCH status - evaluate shadername in RenderItem constructor.
1 parent 56aacf1 commit ad7a4af

7 files changed

Lines changed: 31 additions & 12 deletions

File tree

source/MaterialXTest/MaterialXRender/RenderUtil.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,25 @@ ShaderRenderTester::~ShaderRenderTester()
3232
{
3333
}
3434

35+
RenderItem::RenderItem(mx::TypedElementPtr elem,
36+
mx::FileSearchPath searchPath,
37+
mx::FilePath outPath,
38+
mx::ImageVec* images)
39+
: element(std::move(elem)),
40+
imageSearchPath(std::move(searchPath)),
41+
outputPath(std::move(outPath)),
42+
imageVec(images)
43+
{
44+
static const mx::StringMap pathMap = []() {
45+
mx::StringMap m;
46+
m["/"] = "_";
47+
m[":"] = "_";
48+
return m;
49+
}();
50+
shaderName = mx::createValidName(
51+
mx::replaceSubstrings(element->getNamePath(), pathMap));
52+
}
53+
3554
bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath)
3655
{
3756
// per-run state objects, logger, profiler

source/MaterialXTest/MaterialXRender/RenderUtil.h

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <fstream>
1717
#include <iostream>
1818
#include <memory>
19+
#include <utility>
1920

2021
#define LOG_TO_FILE
2122

@@ -186,18 +187,7 @@ struct RenderItem
186187
RenderItem(mx::TypedElementPtr elem,
187188
mx::FileSearchPath searchPath,
188189
mx::FilePath outPath,
189-
mx::ImageVec* images = nullptr)
190-
: element(std::move(elem)),
191-
imageSearchPath(std::move(searchPath)),
192-
outputPath(std::move(outPath)),
193-
imageVec(images)
194-
{
195-
mx::StringMap pathMap;
196-
pathMap["/"] = "_";
197-
pathMap[":"] = "_";
198-
shaderName = mx::createValidName(
199-
mx::replaceSubstrings(element->getNamePath(), pathMap));
200-
}
190+
mx::ImageVec* images = nullptr);
201191

202192
mx::TypedElementPtr element;
203193
mx::FileSearchPath imageSearchPath;

source/MaterialXTest/MaterialXRenderGlsl/RenderGlsl.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,8 @@ RenderUtil::RenderProfileResult GlslShaderRenderTester::runRenderer(
403403
WARN(std::string(e.what()) + " in " + shaderPath);
404404
}
405405
CHECK(validated);
406+
if (!validated)
407+
result.success = false;
406408
}
407409
}
408410
return result;

source/MaterialXTest/MaterialXRenderMdl/RenderMdl.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ RenderUtil::RenderProfileResult MdlShaderRenderTester::runRenderer(
226226
log << e.what() << "\n";
227227
}
228228
CHECK(validated);
229+
if (!validated)
230+
result.success = false;
229231
}
230232
}
231233

source/MaterialXTest/MaterialXRenderMsl/RenderMsl.mm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,8 @@ void registerLights(mx::DocumentPtr document, const GenShaderUtil::TestSuiteOpti
400400
WARN(std::string(e.what()) + " in " + shaderPath);
401401
}
402402
CHECK(validated);
403+
if (!validated)
404+
result.success = false;
403405
}
404406
}
405407
return result;

source/MaterialXTest/MaterialXRenderOsl/RenderOsl.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,8 @@ RenderUtil::RenderProfileResult OslShaderRenderTester::runRenderer(
372372
log << e.what();
373373
}
374374
CHECK(validated);
375+
if (!validated)
376+
result.success = false;
375377
}
376378
}
377379

source/MaterialXTest/MaterialXRenderSlang/RenderSlang.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,8 @@ RenderUtil::RenderProfileResult SlangShaderRenderTester::runRenderer(
393393
WARN(std::string(e.what()) + " in " + shaderPath);
394394
}
395395
CHECK(validated);
396+
if (!validated)
397+
result.success = false;
396398
}
397399
}
398400
return result;

0 commit comments

Comments
 (0)