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/include/ScriptParser.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'RenderScript/include') diff --git a/RenderScript/include/ScriptParser.h b/RenderScript/include/ScriptParser.h index b65b0fc..9e5cf79 100644 --- a/RenderScript/include/ScriptParser.h +++ b/RenderScript/include/ScriptParser.h @@ -36,6 +36,28 @@ namespace Diligent class ScriptParser : public RefCountedObject { public: + struct CombinedDrawAttribs + { + union + { + Uint32 NumVertices = 0; + Uint32 NumIndices; + }; + VALUE_TYPE IndexType = VT_UNDEFINED; + DRAW_FLAGS Flags = DRAW_FLAG_NONE; + RESOURCE_STATE_TRANSITION_MODE IndirectAttribsBufferStateTransitionMode = RESOURCE_STATE_TRANSITION_MODE_NONE; + Uint32 NumInstances = 1; + Uint32 BaseVertex = 0; + Uint32 IndirectDrawArgsOffset = 0; + union + { + Uint32 StartVertexLocation = 0; + Uint32 FirstIndexLocation; + }; + Uint32 FirstInstanceLocation = 0; + IBuffer* pIndirectDrawAttribs = nullptr; + }; + typedef RefCountedObject TBase; ScriptParser( IReferenceCounters* pRefCounters, IRenderDevice* pRenderDevice ); @@ -102,7 +124,9 @@ namespace Diligent void PushFuncStub( lua_State *L, const RefCntAutoPtr &pBuffer ); void PushFuncStub( lua_State *L, const ITexture* pTexture ); void PushFuncStub( lua_State *L, const RefCntAutoPtr &pTexture ); - void PushFuncStub( lua_State *L, const DrawAttribs &DrawAttribs ); + void PushFuncStub( lua_State *L, const struct CombinedDrawAttribs &Attribs ); + void PushFuncStub( lua_State *L, const DrawAttribs &Attribs ); + void PushFuncStub( lua_State *L, const DrawIndexedAttribs &Attribs ); void PushFuncStub( lua_State *L, const IResourceMapping* pResourceMapping ); void PushFuncStub( lua_State *L, const RefCntAutoPtr &pResourceMapping ); void PushFuncStub( lua_State *L, const ITextureView* pTextureView ); -- cgit v1.2.3