From c985d342626ba289fc2db833ba482f3a40ae05b5 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 28 Jun 2018 08:08:46 -0700 Subject: Unified implementation of IPipelineState::BindShaderResources() --- Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h | 4 ++-- Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h index c8c70731..5aabba85 100644 --- a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h +++ b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.h @@ -47,9 +47,9 @@ public: /// Queries the specific interface, see IObject::QueryInterface() for details virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface )override; - virtual void BindShaderResources( IResourceMapping *pResourceMapping, Uint32 Flags )override; + virtual void BindShaderResources( IResourceMapping *pResourceMapping, Uint32 Flags )override final; - virtual void CreateShaderResourceBinding( IShaderResourceBinding **ppShaderResourceBinding )override; + virtual void CreateShaderResourceBinding( IShaderResourceBinding **ppShaderResourceBinding )override final; virtual bool IsCompatibleWith(const IPipelineState *pPSO)const override final; diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp index 4eeebc88..19503efb 100644 --- a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp @@ -143,10 +143,7 @@ void PipelineStateGLImpl::BindShaderResources(IResourceMapping *pResourceMapping { if( GetDevice()->GetDeviceCaps().bSeparableProgramSupported ) { - for( Uint32 s = 0; s < m_NumShaders; ++s ) - { - m_ppShaders[s]->BindResources( pResourceMapping, Flags ); - } + TPipelineStateBase::BindShaderResources(pResourceMapping, Flags); } else { -- cgit v1.2.3