From 277dba9eacfd41f858127eeaf0f3691a9284b4a4 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Thu, 5 Mar 2015 23:28:31 +0900 Subject: [PATCH] test-platform-abstraction change by adding LoadShaderBinFile() of PlatformAbstraction - LoadShaderBinFile() into test-platform-abstraction.h/cpp Change-Id: Ife440014cc86a6c80102fbf0ade3a7c441c262b9 --- .../dali-toolkit-test-utils/test-platform-abstraction.cpp | 15 +++++++++++++++ .../dali-toolkit-test-utils/test-platform-abstraction.h | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp index aa1b5b2..5ab4b7d 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp @@ -370,6 +370,20 @@ bool TestPlatformAbstraction::LoadFile( const std::string& filename, std::vector } /** + * @copydoc PlatformAbstraction::LoadShaderBinFile() + */ +bool TestPlatformAbstraction::LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const +{ + mTrace.PushCall("LoadShaderBinFile", ""); + if( mLoadFileResult.loadResult ) + { + buffer = mLoadFileResult.buffer; + } + + return mLoadFileResult.loadResult; +} + +/** * @copydoc PlatformAbstraction::SaveFile() */ bool TestPlatformAbstraction::SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const @@ -498,6 +512,7 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func) case LoadResourceFunc: return mTrace.FindMethod("LoadResource"); case SaveResourceFunc: return mTrace.FindMethod("SaveResource"); case LoadFileFunc: return mTrace.FindMethod("LoadFile"); + case LoadShaderBinFileFunc: return mTrace.FindMethod("LoadShaderBinFile"); case SaveFileFunc: return mTrace.FindMethod("SaveFile"); case CancelLoadFunc: return mTrace.FindMethod("CancelLoad"); case GetResourcesFunc: return mTrace.FindMethod("GetResources"); diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h index 2d4c38c..41b06cd 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h @@ -208,6 +208,11 @@ public: virtual bool LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const; /** + * @copydoc PlatformAbstraction::LoadShaderBinFile() + */ + virtual bool LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const; + + /** * @copydoc PlatformAbstraction::SaveFile() */ virtual bool SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const; @@ -251,6 +256,7 @@ public: // TEST FUNCTIONS SaveResourceFunc, SaveFileFunc, LoadFileFunc, + LoadShaderBinFileFunc, CancelLoadFunc, GetResourcesFunc, IsLoadingFunc, -- 2.7.4