From efbb8b10812698d177b8b0ae88ec1b20ee489155 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 28 May 2018 21:37:51 -0700 Subject: Moved buffer stried definition to vertex layout desc --- RenderScript/src/BufferParser.cpp | 8 +------- RenderScript/src/InputLayoutDescParser.cpp | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'RenderScript') diff --git a/RenderScript/src/BufferParser.cpp b/RenderScript/src/BufferParser.cpp index 98e72d0..4b6d489 100644 --- a/RenderScript/src/BufferParser.cpp +++ b/RenderScript/src/BufferParser.cpp @@ -192,7 +192,6 @@ namespace Diligent Uint32 NumBuffers = 0; IBuffer *pBuffs[MaxBufferSlots] = {}; Uint32 Offsets[MaxBufferSlots] = {}; - Uint32 Strides[MaxBufferSlots] = {}; while( CurrArgInd <= NumArgs ) { if( StartSlot + (NumBuffers + 1) > MaxBufferSlots ) @@ -214,11 +213,6 @@ namespace Diligent else Offsets[NumBuffers] = 0; - if( lua_type( L, CurrArgInd ) == LUA_TNUMBER ) - Strides[NumBuffers] = ReadValueFromLua( L, CurrArgInd++ ); - else - Strides[NumBuffers] = 0; - // The last argument may be flags if( CurrArgInd == NumArgs && (lua_type( L, CurrArgInd ) == LUA_TSTRING || @@ -234,7 +228,7 @@ namespace Diligent } auto *pContext = LoadDeviceContextFromRegistry( L ); - pContext->SetVertexBuffers( StartSlot, NumBuffers, pBuffs, Strides, Offsets, Flags ); + pContext->SetVertexBuffers( StartSlot, NumBuffers, pBuffs, Offsets, Flags ); // Return no values to Lua return 0; diff --git a/RenderScript/src/InputLayoutDescParser.cpp b/RenderScript/src/InputLayoutDescParser.cpp index 0bf237d..1e40c13 100644 --- a/RenderScript/src/InputLayoutDescParser.cpp +++ b/RenderScript/src/InputLayoutDescParser.cpp @@ -41,6 +41,7 @@ namespace Diligent DEFINE_BINDER( m_Bindings, LayoutElement, IsNormalized ); DEFINE_BINDER( m_Bindings, LayoutElement, RelativeOffset ); + DEFINE_BINDER( m_Bindings, LayoutElement, Stride ); m_FrequencyEnumMapping.AddMapping( "FREQUENCY_PER_VERTEX", LayoutElement::FREQUENCY_PER_VERTEX ); -- cgit v1.2.3