From 89ddb50eaccc1b7b590dbde55032721762711fb2 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 24 Oct 2019 17:58:24 -0400 Subject: OffsetContainer serialization (#1093) * OffsetContainer with unit tests. * State serialization working with OffsetContainer. * Fixes to make work with OffsetContainer. * Added OffsetContainer documentation. * Remove RelativeContainer. * Fix problem with + on Offset32Ptr on windows x86 target. * * Made OffsetBase a base class of OffsetContainer. * Added MemoryOffsetBase to just handle being a chunk of memory. * * Use operator[] to access contents of OffsetContainer * Fix the type hash to work across different size_t sizes. * Fixed some Offset type related comments. * Fix bug around using asBase, because it returns a reference just using 'auto' will means it becomes a value type. Remove assignment and copy ctor from OffsetBase. * Evaluation order of assignment can lead to wrong behavior with Offset32Ptr/raw pointers. Document the fact, and fix in StateSerializeUtil. --- source/slang/slang.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source/slang/slang.cpp') diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 8479d3202..3053b60c0 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -3465,9 +3465,12 @@ SLANG_API SlangResult spLoadRepro( List buffer; SLANG_RETURN_ON_FAIL(StateSerializeUtil::loadState((const uint8_t*)data, size, buffer)); + MemoryOffsetBase base; + base.set(buffer.getBuffer(), buffer.getCount()); + StateSerializeUtil::RequestState* requestState = StateSerializeUtil::getRequest(buffer); - SLANG_RETURN_ON_FAIL(StateSerializeUtil::load(requestState, fileSystem, request)); + SLANG_RETURN_ON_FAIL(StateSerializeUtil::load(base, requestState, fileSystem, request)); return SLANG_OK; } @@ -3512,8 +3515,11 @@ SLANG_API SlangResult spExtractRepro(SlangSession* session, const void* reproDat SLANG_RETURN_ON_FAIL(StateSerializeUtil::loadState(&memoryStream, buffer)); } + MemoryOffsetBase base; + base.set(buffer.getBuffer(), buffer.getCount()); + StateSerializeUtil::RequestState* requestState = StateSerializeUtil::getRequest(buffer); - return StateSerializeUtil::extractFiles(requestState, fileSystem); + return StateSerializeUtil::extractFiles(base, requestState, fileSystem); } // Reflection API -- cgit v1.2.3