From 7d05cc25ac7aa339c232843d729c9e0914f973ed Mon Sep 17 00:00:00 2001 From: azhirnov Date: Mon, 7 Sep 2020 21:06:20 +0300 Subject: Added pDxCompilerPath to engine create info, fixed DXC usage in Linux, fixed FX compiler path for Win8, fixed DXC name refactoring: rename DXIL to DXC, keep DXIL names only for D3D12, disable DXC on Android --- Graphics/GraphicsEngine/interface/GraphicsTypes.h | 7 +++++++ Graphics/GraphicsEngine/interface/Shader.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index 95d3dd76..c6a9eb5c 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -1685,6 +1685,10 @@ struct EngineD3D12CreateInfo DILIGENT_DERIVE(EngineCreateInfo) } #endif ; + + /// Path to DirectX Shader Compiler, which required to use Shader Module 6 features. + /// By default engine will search for "dxcompiler.dll". + const char* pDxCompilerPath DEFAULT_INITIALIZER(nullptr); }; typedef struct EngineD3D12CreateInfo EngineD3D12CreateInfo; @@ -1823,6 +1827,9 @@ struct EngineVkCreateInfo DILIGENT_DERIVE(EngineCreateInfo) } #endif ; + + /// Path to DirectX Shader Compiler, which required to use Shader Module 6 features for HLSL. + const char* pDxCompilerPath DEFAULT_INITIALIZER(nullptr); }; typedef struct EngineVkCreateInfo EngineVkCreateInfo; diff --git a/Graphics/GraphicsEngine/interface/Shader.h b/Graphics/GraphicsEngine/interface/Shader.h index 883e51d8..a85ab726 100644 --- a/Graphics/GraphicsEngine/interface/Shader.h +++ b/Graphics/GraphicsEngine/interface/Shader.h @@ -61,7 +61,7 @@ DEFINE_FLAG_ENUM_OPERATORS(SHADER_TYPE); /// Describes shader source code language DILIGENT_TYPED_ENUM(SHADER_SOURCE_LANGUAGE, Uint32) { - /// Default language (GLSL for OpenGL/OpenGLES devices, HLSL for Direct3D11/Direct3D12 devices) + /// Default language (GLSL for OpenGL/OpenGLES/Vulkan devices, HLSL for Direct3D11/Direct3D12 devices) SHADER_SOURCE_LANGUAGE_DEFAULT = 0, /// The source language is HLSL -- cgit v1.2.3