From 22c7a4de0c3810fcfc1099843e42b315c366a7c5 Mon Sep 17 00:00:00 2001 From: Kai-Hwa Yao Date: Mon, 10 Jul 2017 17:44:14 -0700 Subject: Removed spGetTranslationUnitCode; Unified EntryPointResult/TranslationUnitResult, added helper functionality; Ensure null termination when printing raw data --- source/slang/slang.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'source/slang/slang.cpp') diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 7f30e91c2..0561f30a9 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -862,18 +862,7 @@ SLANG_API char const* spGetTranslationUnitSource( int translationUnitIndex) { auto req = REQ(request); - return (char const*)req->translationUnits[translationUnitIndex]->result.outputSource.Buffer(); -} - -SLANG_API void const* spGetTranslationUnitCode( - SlangCompileRequest* request, - int translationUnitIndex, - size_t* outSize) -{ - auto req = REQ(request); - Slang::TranslationUnitResult& result = req->translationUnits[translationUnitIndex]->result; - *outSize = (size_t)result.outputSource.Count(); - return result.outputSource.Buffer(); + return req->translationUnits[translationUnitIndex]->result.outputString.Buffer(); } SLANG_API char const* spGetEntryPointSource( @@ -881,8 +870,7 @@ SLANG_API char const* spGetEntryPointSource( int entryPointIndex) { auto req = REQ(request); - return (char const*)req->entryPoints[entryPointIndex]->result.outputSource.Buffer(); - + return req->entryPoints[entryPointIndex]->result.outputString.Buffer(); } SLANG_API void const* spGetEntryPointCode( @@ -891,9 +879,9 @@ SLANG_API void const* spGetEntryPointCode( size_t* outSize) { auto req = REQ(request); - Slang::EntryPointResult& result = req->entryPoints[entryPointIndex]->result; - *outSize = (size_t)result.outputSource.Count(); - return result.outputSource.Buffer(); + Slang::CompileResult& result = req->entryPoints[entryPointIndex]->result; + if(outSize) *outSize = result.outputBinary.Count(); + return result.outputBinary.Buffer(); } // Reflection API -- cgit v1.2.3