From 62dbbec16e3fbd9c6a7ab8943e727676d2ca5d20 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 19 Oct 2019 12:49:52 -0700 Subject: Few updates to comply with API version 240033 --- RenderScript/src/ScriptParser.cpp | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'RenderScript/src/ScriptParser.cpp') diff --git a/RenderScript/src/ScriptParser.cpp b/RenderScript/src/ScriptParser.cpp index 72c7ee2..7862303 100644 --- a/RenderScript/src/ScriptParser.cpp +++ b/RenderScript/src/ScriptParser.cpp @@ -67,9 +67,33 @@ namespace Diligent IMPLEMENT_PUSH_FUNC_STUBS( IShaderResourceBinding, m_pShaderResBindingParser ) - void ScriptParser::SpecialPushFuncs::PushFuncStub( lua_State *L, const DrawAttribs &DrawAttribs ) + void ScriptParser::SpecialPushFuncs::PushFuncStub( lua_State *L, const CombinedDrawAttribs &CombinedAttribs ) { - m_pScriptParser->m_pDrawAttribsParser->PushObject( L, &DrawAttribs ); + m_pScriptParser->m_pDrawAttribsParser->PushObject( L, &CombinedAttribs ); + } + + void ScriptParser::SpecialPushFuncs::PushFuncStub( lua_State *L, const DrawAttribs &Attribs ) + { + CombinedDrawAttribs CombinedAttribs; + CombinedAttribs.FirstInstanceLocation = Attribs.FirstInstanceLocation; + CombinedAttribs.Flags = Attribs.Flags; + CombinedAttribs.NumInstances = Attribs.NumInstances; + CombinedAttribs.NumVertices = Attribs.NumVertices; + CombinedAttribs.StartVertexLocation = Attribs.StartVertexLocation; + PushFuncStub( L, CombinedAttribs ); + } + + void ScriptParser::SpecialPushFuncs::PushFuncStub( lua_State *L, const DrawIndexedAttribs &Attribs ) + { + CombinedDrawAttribs CombinedAttribs; + CombinedAttribs.BaseVertex = Attribs.BaseVertex; + CombinedAttribs.FirstIndexLocation = Attribs.FirstIndexLocation; + CombinedAttribs.FirstInstanceLocation = Attribs.FirstInstanceLocation; + CombinedAttribs.Flags = Attribs.Flags; + CombinedAttribs.IndexType = Attribs.IndexType; + CombinedAttribs.NumIndices = Attribs.NumIndices; + CombinedAttribs.NumInstances = Attribs.NumInstances; + PushFuncStub( L, CombinedAttribs ); } void ScriptParser::SpecialPushFuncs::PushFuncStub( lua_State *L, const Viewport &Viewport ) -- cgit v1.2.3