summaryrefslogtreecommitdiff
path: root/tools/render-test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/render-test')
-rw-r--r--tools/render-test/render-test-main.cpp7
-rw-r--r--tools/render-test/slang-support.cpp25
-rw-r--r--tools/render-test/slang-support.h10
3 files changed, 18 insertions, 24 deletions
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index ab73af5b5..a846f4a33 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -470,7 +470,7 @@ SlangResult RenderTestApp::initialize(
// We begin by compiling the shader file and entry points that specified via the options.
//
- SLANG_RETURN_ON_FAIL(ShaderCompilerUtil::compileWithLayout(session, options, input, m_compilationOutput));
+ SLANG_RETURN_ON_FAIL(ShaderCompilerUtil::compileWithLayout(device->getSlangSession(), options, input, m_compilationOutput));
m_shaderInputLayout = m_compilationOutput.layout;
// Once the shaders have been compiled we load them via the underlying API.
@@ -551,7 +551,7 @@ Result RenderTestApp::_initializeShaders(
Options::ShaderProgramType shaderType,
const ShaderCompilerUtil::Input& input)
{
- SLANG_RETURN_ON_FAIL(ShaderCompilerUtil::compileWithLayout(session, m_options, input, m_compilationOutput));
+ SLANG_RETURN_ON_FAIL(ShaderCompilerUtil::compileWithLayout(device->getSlangSession(), m_options, input, m_compilationOutput));
m_shaderInputLayout = m_compilationOutput.layout;
m_shaderProgram = device->createProgram(m_compilationOutput.output.desc);
return m_shaderProgram ? SLANG_OK : SLANG_FAIL;
@@ -672,6 +672,7 @@ void RenderTestApp::runCompute(IComputeCommandEncoder* encoder)
void RenderTestApp::finalize()
{
+ m_compilationOutput.output.reset();
}
Result RenderTestApp::writeBindingOutput(const String& fileName)
@@ -1099,6 +1100,8 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi
desc.deviceType = options.deviceType;
desc.adapter = options.adapter.getBuffer();
+ desc.slang.lineDirectiveMode = SLANG_LINE_DIRECTIVE_MODE_NONE;
+
List<const char*> requiredFeatureList;
for (auto& name : options.renderFeatures)
requiredFeatureList.add(name.getBuffer());
diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp
index adfea337c..a533a6378 100644
--- a/tools/render-test/slang-support.cpp
+++ b/tools/render-test/slang-support.cpp
@@ -66,26 +66,19 @@ void ShaderCompilerUtil::Output::reset()
desc.slangProgram = nullptr;
}
- if (m_requestForKernels && session)
- {
- spDestroyCompileRequest(m_requestForKernels);
- }
- if (m_extraRequestForReflection && session)
- {
- spDestroyCompileRequest(m_extraRequestForReflection);
- }
session = nullptr;
m_requestForKernels = nullptr;
m_extraRequestForReflection = nullptr;
}
-/* static */ SlangResult ShaderCompilerUtil::_compileProgramImpl(SlangSession* session, const Options& options, const Input& input, const ShaderCompileRequest& request, Output& out)
+/* static */ SlangResult ShaderCompilerUtil::_compileProgramImpl(slang::ISession* session, const Options& options, const Input& input, const ShaderCompileRequest& request, Output& out)
{
out.reset();
- SlangCompileRequest* slangRequest = spCreateCompileRequest(session);
+ ComPtr<SlangCompileRequest> slangRequest = nullptr;
+ session->createCompileRequest(slangRequest.writeRef());
out.m_requestForKernels = slangRequest;
- out.session = session;
+ out.session = session->getGlobalSession();
// Parse all the extra args
{
@@ -102,7 +95,7 @@ void ShaderCompilerUtil::Output::reset()
}
spSetCodeGenTarget(slangRequest, input.target);
- spSetTargetProfile(slangRequest, 0, spFindProfile(session, input.profile.getBuffer()));
+ spSetTargetProfile(slangRequest, 0, spFindProfile(out.session, input.profile.getBuffer()));
// Define a macro so that shader code in a test can detect what language we
// are nominally working with.
@@ -241,11 +234,10 @@ void ShaderCompilerUtil::Output::reset()
}
out.set(input.pipelineType, linkedSlangProgram);
-
return SLANG_OK;
}
-/* static */ SlangResult ShaderCompilerUtil::compileProgram(SlangSession* session, const Options& options, const Input& input, const ShaderCompileRequest& request, Output& out)
+/* static */ SlangResult ShaderCompilerUtil::compileProgram(slang::ISession* session, const Options& options, const Input& input, const ShaderCompileRequest& request, Output& out)
{
if( input.passThrough == SLANG_PASS_THROUGH_NONE )
{
@@ -319,7 +311,7 @@ void ShaderCompilerUtil::Output::reset()
return SLANG_OK;
}
-/* static */SlangResult ShaderCompilerUtil::compileWithLayout(SlangSession* session, const Options& options, const ShaderCompilerUtil::Input& input, OutputAndLayout& output)
+/* static */SlangResult ShaderCompilerUtil::compileWithLayout(slang::ISession* session, const Options& options, const ShaderCompilerUtil::Input& input, OutputAndLayout& output)
{
String sourcePath = options.sourcePath;
auto shaderType = options.shaderType;
@@ -331,7 +323,7 @@ void ShaderCompilerUtil::Output::reset()
{
// Add an include of the prelude
ComPtr<ISlangBlob> prelude;
- session->getLanguagePrelude(input.sourceLanguage, prelude.writeRef());
+ session->getGlobalSession()->getLanguagePrelude(input.sourceLanguage, prelude.writeRef());
String preludeString = StringUtil::getString(prelude);
@@ -421,7 +413,6 @@ void ShaderCompilerUtil::Output::reset()
}
compileRequest.globalSpecializationArgs = layout.globalSpecializationArgs;
compileRequest.entryPointSpecializationArgs = layout.entryPointSpecializationArgs;
-
return ShaderCompilerUtil::compileProgram(session, options, input, compileRequest, output.output);
}
diff --git a/tools/render-test/slang-support.h b/tools/render-test/slang-support.h
index 3404aac1d..da1f379fd 100644
--- a/tools/render-test/slang-support.h
+++ b/tools/render-test/slang-support.h
@@ -67,10 +67,10 @@ struct ShaderCompilerUtil
IShaderProgram::Desc desc = {};
/// Compile request that owns the lifetime of compiled kernel code.
- SlangCompileRequest* m_requestForKernels = nullptr;
+ ComPtr<SlangCompileRequest> m_requestForKernels = nullptr;
/// Compile request that owns the lifetime of reflection information.
- SlangCompileRequest* m_extraRequestForReflection = nullptr;
+ ComPtr<SlangCompileRequest> m_extraRequestForReflection = nullptr;
SlangCompileRequest* getRequestForKernels() const { return m_requestForKernels; }
SlangCompileRequest* getRequestForReflection() const { return m_extraRequestForReflection ? m_extraRequestForReflection : m_requestForKernels; }
@@ -86,12 +86,12 @@ struct ShaderCompilerUtil
Slang::String sourcePath;
};
- static SlangResult compileWithLayout(SlangSession* session, const Options& options, const ShaderCompilerUtil::Input& input, OutputAndLayout& output);
+ static SlangResult compileWithLayout(slang::ISession* session, const Options& options, const ShaderCompilerUtil::Input& input, OutputAndLayout& output);
static SlangResult readSource(const Slang::String& inSourcePath, Slang::List<char>& outSourceText);
- static SlangResult _compileProgramImpl(SlangSession* session, const Options& options, const Input& input, const ShaderCompileRequest& request, Output& out);
- static SlangResult compileProgram(SlangSession* session, const Options& options, const Input& input, const ShaderCompileRequest& request, Output& out);
+ static SlangResult _compileProgramImpl(slang::ISession* session, const Options& options, const Input& input, const ShaderCompileRequest& request, Output& out);
+ static SlangResult compileProgram(slang::ISession* session, const Options& options, const Input& input, const ShaderCompileRequest& request, Output& out);
};
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-19 12:23:56 +0000