1 files changed, 9 insertions, 10 deletions
diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp
index aca42a25c..2879acfac 100644
--- a/tools/render-test/options.cpp
+++ b/tools/render-test/options.cpp
@@ -22,20 +22,19 @@
 namespace renderer_test {
 using namespace Slang;
 
-static gfx::DeviceType _toRenderType(Slang::RenderApiType apiType)
+static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType)
 {
     using namespace Slang;
     switch (apiType)
     {
-    case RenderApiType::D3D11:  return gfx::DeviceType::DirectX11;
-    case RenderApiType::D3D12:  return gfx::DeviceType::DirectX12;
-    case RenderApiType::OpenGl: return gfx::DeviceType::OpenGl;
-    case RenderApiType::Vulkan: return gfx::DeviceType::Vulkan;
-    case RenderApiType::Metal:  return gfx::DeviceType::Metal;
-    case RenderApiType::CPU:    return gfx::DeviceType::CPU;
-    case RenderApiType::CUDA:   return gfx::DeviceType::CUDA;
+    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;
     default:
-        return gfx::DeviceType::Unknown;
+        return rhi::DeviceType::Unknown;
     }
 }
 
@@ -254,7 +253,7 @@ static gfx::DeviceType _toRenderType(Slang::RenderApiType apiType)
                 // Lookup the target language type
                 DeviceType targetLanguageDeviceType = _toRenderType(RenderApiUtil::findImplicitLanguageRenderApiType(argName));
                     
-                if (targetLanguageDeviceType != DeviceType::Unknown)
+                if (targetLanguageDeviceType != DeviceType::Unknown || argName == "glsl")
                 {
                     outOptions.targetLanguageDeviceType = targetLanguageDeviceType;
                     outOptions.inputLanguageID = (argName == "hlsl" || argName == "glsl" || argName == "cpp" || argName == "cxx" || argName == "c") ?  InputLanguageID::Native : InputLanguageID::Slang;