diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-11-13 03:18:57 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-11-13 03:18:57 +0000 |
| commit | 5e3941de79b573b8798f6a6bcd4eaf544c48cde2 (patch) | |
| tree | 77f33c32420cec66a88f24555f7211c02136468a /RenderScript/src/BufferParser.cpp | |
| parent | Merge from dev branch (diff) | |
| download | DiligentTools-5e3941de79b573b8798f6a6bcd4eaf544c48cde2.tar.gz DiligentTools-5e3941de79b573b8798f6a6bcd4eaf544c48cde2.zip | |
Updated to version 2.1
Diffstat (limited to 'RenderScript/src/BufferParser.cpp')
| -rw-r--r-- | RenderScript/src/BufferParser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/RenderScript/src/BufferParser.cpp b/RenderScript/src/BufferParser.cpp index 92cbc2e..40cda67 100644 --- a/RenderScript/src/BufferParser.cpp +++ b/RenderScript/src/BufferParser.cpp @@ -83,7 +83,7 @@ namespace Diligent DEFINE_FLAGS_BINDER( m_Bindings, SBuffDescWrapper, CPUAccessFlags, CPU_ACCESS_FLAG, m_CpuAccessFlagEnumMapping ); DEFINE_ENUM_ELEMENT_MAPPING( m_BuffModeEnumMapping, BUFFER_MODE_UNDEFINED ); - DEFINE_ENUM_ELEMENT_MAPPING( m_BuffModeEnumMapping, BUFFER_MODE_FORMATED ); + DEFINE_ENUM_ELEMENT_MAPPING( m_BuffModeEnumMapping, BUFFER_MODE_FORMATTED ); DEFINE_ENUM_ELEMENT_MAPPING( m_BuffModeEnumMapping, BUFFER_MODE_STRUCTURED ); static_assert(BUFFER_MODE_NUM_MODES == BUFFER_MODE_STRUCTURED + 1, "Not all buffer modes initialized."); VERIFY( m_BuffModeEnumMapping.m_Str2ValMap.size() == BUFFER_MODE_NUM_MODES, @@ -106,11 +106,11 @@ namespace Diligent ParseLuaTable( L, 1, &BufferDesc, m_Bindings ); CHECK_LUA_STACK_HEIGHT(); - if( BufferDesc.Mode == BUFFER_MODE_FORMATED ) + if( BufferDesc.Mode == BUFFER_MODE_FORMATTED ) { auto &BuffFmt = BufferDesc.Format; if( BuffFmt.ValueType == VT_UNDEFINED || BuffFmt.NumComponents == 0 ) - SCRIPT_PARSING_ERROR( L, "Valid format must be specified for a formated buffer" ); + SCRIPT_PARSING_ERROR( L, "Valid format must be specified for a formatted buffer" ); auto FmtSize = GetValueSize( BuffFmt.ValueType ) * BuffFmt.NumComponents; if( BufferDesc.ElementByteStride != 0 ) { @@ -128,7 +128,7 @@ namespace Diligent if( BufferDesc.Mode == BUFFER_MODE_STRUCTURED && BufferDesc.ElementByteStride == 0 ) SCRIPT_PARSING_ERROR( L, "UAV element byte stride of a structured buffer cannot be zero" ); - if( (BufferDesc.Mode == BUFFER_MODE_FORMATED || BufferDesc.Mode == BUFFER_MODE_STRUCTURED) && + if( (BufferDesc.Mode == BUFFER_MODE_FORMATTED || BufferDesc.Mode == BUFFER_MODE_STRUCTURED) && (BufferDesc.uiSizeInBytes % BufferDesc.ElementByteStride) != 0 ) SCRIPT_PARSING_ERROR( L, "Buffer size (", BufferDesc.uiSizeInBytes, ") is not multiple of element byte stride (", BufferDesc.ElementByteStride, ")." ); |