From c4ea9e14f1ab92265bb146207e11c0c40e5761e3 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 24 Nov 2018 11:09:26 -0800 Subject: Added InitializeStaticResources lua function --- RenderScript/include/ShaderResourceBindingParser.h | 3 +++ RenderScript/src/ShaderResourceBindingParser.cpp | 21 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'RenderScript') diff --git a/RenderScript/include/ShaderResourceBindingParser.h b/RenderScript/include/ShaderResourceBindingParser.h index fe00a65..9785c78 100644 --- a/RenderScript/include/ShaderResourceBindingParser.h +++ b/RenderScript/include/ShaderResourceBindingParser.h @@ -65,5 +65,8 @@ namespace Diligent int CreateShaderResourceBinding( lua_State *L ); ClassMethodCaller m_CreateShaderResourceBinding; + + int InitializeStaticResources( lua_State *L ); + ClassMethodCaller < ShaderResourceBindingParser > m_InitializeStaticResourcesBinding; }; } diff --git a/RenderScript/src/ShaderResourceBindingParser.cpp b/RenderScript/src/ShaderResourceBindingParser.cpp index 80a5092..7c0447a 100644 --- a/RenderScript/src/ShaderResourceBindingParser.cpp +++ b/RenderScript/src/ShaderResourceBindingParser.cpp @@ -38,7 +38,8 @@ namespace Diligent m_ShaderVarMetatableRegistryName(ShaderVarMetatableRegistryName), m_BindResourcesBinding( this, L, m_MetatableRegistryName.c_str(), "BindResources", &ShaderResourceBindingParser::BindResources ), m_GetVariableBinding( this, L, m_MetatableRegistryName.c_str(), "GetVariable", &ShaderResourceBindingParser::GetVariable ), - m_CreateShaderResourceBinding( this, L, PSOLibMetatableName.c_str(), "CreateShaderResourceBinding", &ShaderResourceBindingParser::CreateShaderResourceBinding ) + m_CreateShaderResourceBinding( this, L, PSOLibMetatableName.c_str(), "CreateShaderResourceBinding", &ShaderResourceBindingParser::CreateShaderResourceBinding ), + m_InitializeStaticResourcesBinding( this, L, m_MetatableRegistryName.c_str(), "InitializeStaticResources", &ShaderResourceBindingParser::InitializeStaticResources ) { } @@ -48,7 +49,7 @@ namespace Diligent { INIT_LUA_STACK_TRACKING(L); - // Shader should be the first argument + // PSO should be the first argument auto *pPSO = *GetUserData( L, 1, m_PSOLibMetatableName.c_str() ); bool InitStaticResources = false; @@ -190,6 +191,22 @@ namespace Diligent return 1; } + int ShaderResourceBindingParser::InitializeStaticResources( lua_State *L ) + { + auto NumArgs = lua_gettop( L ); + // The object itself goes first + auto *pShaderResBinding = *GetUserData( L, 1, m_MetatableRegistryName.c_str() ); + IPipelineState* pPSO = nullptr; + + if (NumArgs >= 2) + { + pPSO = *GetUserData( L, 2, m_PSOLibMetatableName.c_str() ); + } + + pShaderResBinding->InitializeStaticResources(pPSO); + return 0; + } + void ShaderResourceBindingParser::GetObjectByName( lua_State *L, const Char *ShaderName, IShaderResourceBinding** ppObject ) { auto pObject = *GetGlobalObject( L, ShaderName, m_MetatableRegistryName.c_str() ); -- cgit v1.2.3