diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-28 17:49:14 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-28 17:49:14 +0000 |
| commit | 826fd40b949f074ee327d4d31c2eb1c68d6df448 (patch) | |
| tree | c6bf448a3d82ed583e0e5396bffe720c8d8ef131 /Graphics | |
| parent | Added Vulkan C API tests (diff) | |
| download | DiligentCore-826fd40b949f074ee327d4d31c2eb1c68d6df448.tar.gz DiligentCore-826fd40b949f074ee327d4d31c2eb1c68d6df448.zip | |
Reworked IShaderD3D::GetHLSLResource method to be compatible wit C
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp | 6 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp | 6 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp index 214bedca..34f6d48a 100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp @@ -68,13 +68,13 @@ public: /// Implementation of IShader::GetResource() in Direct3D11 backend. virtual void GetResourceDesc(Uint32 Index, ShaderResourceDesc& ResourceDesc) const override final { - ResourceDesc = GetHLSLResource(Index); + ResourceDesc = m_pShaderResources->GetHLSLShaderResourceDesc(Index); } /// Implementation of IShaderD3D::GetHLSLResource() method. - virtual HLSLShaderResourceDesc GetHLSLResource(Uint32 Index) const override final + virtual void GetHLSLResource(Uint32 Index, HLSLShaderResourceDesc& ResourceDesc) const override final { - return m_pShaderResources->GetHLSLShaderResourceDesc(Index); + ResourceDesc = m_pShaderResources->GetHLSLShaderResourceDesc(Index); } /// Implementation of IShaderD3D11::GetD3D11Shader() method. diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp index 6eb8e5d8..3d38d666 100644 --- a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp +++ b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp @@ -65,13 +65,13 @@ public: /// Implementation of IShader::GetResource() in Direct3D12 backend. virtual void GetResourceDesc(Uint32 Index, ShaderResourceDesc& ResourceDesc) const override final { - ResourceDesc = GetHLSLResource(Index); + ResourceDesc = m_pShaderResources->GetHLSLShaderResourceDesc(Index); } /// Implementation of IShaderD3D::GetHLSLResource() in Direct3D12 backend. - virtual HLSLShaderResourceDesc GetHLSLResource(Uint32 Index) const override final + virtual void GetHLSLResource(Uint32 Index, HLSLShaderResourceDesc& ResourceDesc) const override final { - return m_pShaderResources->GetHLSLShaderResourceDesc(Index); + ResourceDesc = m_pShaderResources->GetHLSLShaderResourceDesc(Index); } ID3DBlob* GetShaderByteCode() { return m_pShaderByteCode; } diff --git a/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h b/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h index 55ec3a5c..f64ba232 100644 --- a/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h +++ b/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h @@ -57,7 +57,7 @@ class IShaderD3D : public IShader { public: /// Returns HLSL shader resource description - virtual HLSLShaderResourceDesc GetHLSLResource(Uint32 Index) const = 0; + virtual void GetHLSLResource(Uint32 Index, HLSLShaderResourceDesc& ResourceDesc) const = 0; }; #else |