diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-10-28 02:49:19 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-10-28 02:49:19 +0000 |
| commit | a59012af4b50cc053ac3b0856d594a1170a3263b (patch) | |
| tree | 5f1939de540a5e7b953445444f978f1d0710451b /Graphics/GraphicsEngineOpenGL | |
| parent | Fixed Linux/Max build errors (diff) | |
| parent | Fixed issue with wrong base constructor being called for PipelineStateVkImpl,... (diff) | |
| download | DiligentCore-a59012af4b50cc053ac3b0856d594a1170a3263b.tar.gz DiligentCore-a59012af4b50cc053ac3b0856d594a1170a3263b.zip | |
Merge branch 'master' into ray_tracing
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp index b911cdde..32be5dfc 100644 --- a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp @@ -82,7 +82,7 @@ PipelineStateGLImpl::PipelineStateGLImpl(IReferenceCounters* { pRefCounters, pDeviceGL, - CreateInfo.PSODesc, + CreateInfo, bIsDeviceInternal }, m_ResourceLayout {*this}, @@ -127,7 +127,7 @@ PipelineStateGLImpl::PipelineStateGLImpl(IReferenceCounters* p { pRefCounters, pDeviceGL, - CreateInfo.PSODesc, + CreateInfo, bIsDeviceInternal }, m_ResourceLayout {*this}, |