Merge branch 'master' into feature/prelude-fix

2 files changed, 3 insertions, 3 deletions

diff --git a/tools/render-test/cpu-compute-util.cpp b/tools/render-test/cpu-compute-util.cpp
index e8b9e8b32..dc3ea1afa 100644
--- a/tools/render-test/cpu-compute-util.cpp
+++ b/tools/render-test/cpu-compute-util.cpp
@@ -619,8 +619,8 @@ static SlangResult _newTexture(const InputTextureDesc& desc, slang::TypeLayoutRe
 
 /* static */SlangResult CPUComputeUtil::execute(const ExecuteInfo& info)
 {
-    CPPPrelude::UniformState* uniformState = (CPPPrelude::UniformState*)info.m_uniformState;
-    CPPPrelude::UniformEntryPointParams* uniformEntryPointParams = (CPPPrelude::UniformEntryPointParams*)info.m_uniformEntryPointParams;
+    void* uniformState = info.m_uniformState;
+    void* uniformEntryPointParams = info.m_uniformEntryPointParams;
 
     switch (info.m_style)
     {
diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp
index 3e5cc9a1c..da6ceb010 100644
--- a/tools/render-test/slang-support.cpp
+++ b/tools/render-test/slang-support.cpp
@@ -265,7 +265,7 @@ static gfx::StageType _translateStage(SlangStage slangStage)
     {
         // Add an include of the prelude
         ComPtr<ISlangBlob> prelude;
-        session->getDownstreamCompilerPrelude(SLANG_PASS_THROUGH_GENERIC_C_CPP, prelude.writeRef());
+        session->getLanguagePrelude(input.sourceLanguage, prelude.writeRef());
 
         String preludeString = StringUtil::getString(prelude);