From d6d73dd8e7f98f6591f93b7ecda08b34cce518ec Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 5 Apr 2019 08:52:31 -0700 Subject: Changes to comply with the updated API --- RenderScript/src/ShaderResourceBindingParser.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'RenderScript/src/ShaderResourceBindingParser.cpp') diff --git a/RenderScript/src/ShaderResourceBindingParser.cpp b/RenderScript/src/ShaderResourceBindingParser.cpp index 32c8176..ed24c0d 100644 --- a/RenderScript/src/ShaderResourceBindingParser.cpp +++ b/RenderScript/src/ShaderResourceBindingParser.cpp @@ -37,7 +37,8 @@ namespace Diligent m_ResMappingMetatableName(ResMappingMetatableName), 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_GetVariableByNameBinding( this, L, m_MetatableRegistryName.c_str(), "GetVariableByName", &ShaderResourceBindingParser::GetVariable ), + m_GetVariableByIndexBinding( this, L, m_MetatableRegistryName.c_str(), "GetVariableByIndex", &ShaderResourceBindingParser::GetVariable ), m_CreateShaderResourceBinding( this, L, PSOLibMetatableName.c_str(), "CreateShaderResourceBinding", &ShaderResourceBindingParser::CreateShaderResourceBinding ), m_InitializeStaticResourcesBinding( this, L, m_MetatableRegistryName.c_str(), "InitializeStaticResources", &ShaderResourceBindingParser::InitializeStaticResources ) { @@ -171,10 +172,19 @@ namespace Diligent ShaderTypeParser.SetValue(L, ArgStackInd, &ShaderType); ++ArgStackInd; - // Variable name should be the second argument - auto VarName = ReadValueFromLua( L, ArgStackInd ); - - auto pVar = pShaderResBinding->GetVariable(ShaderType, VarName.c_str()); + IShaderResourceVariable* pVar = nullptr; + if (lua_type(L,ArgStackInd) == LUA_TSTRING) + { + // Variable name should be the second argument + auto VarName = ReadValueFromLua( L, ArgStackInd ); + pVar = pShaderResBinding->GetVariableByName(ShaderType, VarName.c_str()); + } + else + { + // Variable name should be the second argument + auto VarIndex = ReadValueFromLua( L, ArgStackInd ); + pVar = pShaderResBinding->GetVariableByIndex(ShaderType, VarIndex); + } auto pNewShaderVarLuaObj = reinterpret_cast(lua_newuserdata( L, sizeof( IShaderResourceVariable* ) )); *pNewShaderVarLuaObj = pVar; -- cgit v1.2.3