diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-09-01 18:24:44 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-09-01 18:24:44 +0000 |
| commit | f74b374c22a3fd411ef5c7b39297296f6d0aa041 (patch) | |
| tree | f8671e2512f47b0c6ddb479d8af83b354c51c8b3 /Graphics/GraphicsEngineD3DBase | |
| parent | validate included file name (fix for samples) (diff) | |
| download | DiligentCore-f74b374c22a3fd411ef5c7b39297296f6d0aa041.tar.gz DiligentCore-f74b374c22a3fd411ef5c7b39297296f6d0aa041.zip | |
fixed compilation on linux & android
Diffstat (limited to 'Graphics/GraphicsEngineD3DBase')
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp index 2a236966..1370a726 100644 --- a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp +++ b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp @@ -173,7 +173,7 @@ static HRESULT CompileDxilShader(const char* Source, ToUnicode(ShaderCI.EntryPoint), ToUnicode(profile), D3DMacros.data(), D3DMacros.size(), - pArgs, std::size(pArgs), + pArgs, _countof(pArgs), ShaderCI.pShaderSourceStreamFactory, reinterpret_cast<IDxcBlob**>(ppBlobOut), reinterpret_cast<IDxcBlob**>(ppCompilerOutput))) @@ -352,7 +352,10 @@ ShaderD3DBase::ShaderD3DBase(const ShaderCreateInfo& ShaderCI, const ShaderVersi } if (RequiredVersion.Major != 0 && (ShaderModel.Major != RequiredVersion.Major || ShaderModel.Minor != RequiredVersion.Minor)) - LOG_INFO_MESSAGE("Shader '", (ShaderCI.Desc.Name != nullptr ? ShaderCI.Desc.Name : ""), "': version changed to ", ShaderModel.Major, ".", ShaderModel.Minor); + { + LOG_INFO_MESSAGE("Shader '", (ShaderCI.Desc.Name != nullptr ? ShaderCI.Desc.Name : ""), "': version changed from ", + Uint32(RequiredVersion.Major), ".", Uint32(RequiredVersion.Minor), " to ", Uint32(ShaderModel.Major), ".", Uint32(ShaderModel.Minor)); + } std::string strShaderProfile; switch (ShaderCI.Desc.ShaderType) |