From 51714a1199a9dd560fb0c1648c10c812ac35e1ab Mon Sep 17 00:00:00 2001 From: Andrew Cox Date: Tue, 23 Jun 2015 19:03:05 +0100 Subject: [PATCH] Shader binary synchronous simplified IO Change-Id: Ie09e73965389ba0229a42ecd7f9e32f49764710e Signed-off-by: Andrew Cox --- .../test-platform-abstraction.cpp | 21 ++++++++++---------- .../test-platform-abstraction.h | 23 +++++++++++++--------- 2 files changed, 25 insertions(+), 19 deletions(-) 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 ad8de5c..6acbca7 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 @@ -66,7 +66,7 @@ void TestPlatformAbstraction::Resume() ImageDimensions TestPlatformAbstraction::GetClosestImageSize( const std::string& filename, ImageDimensions size, - FittingMode::Type scalingMode, + FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ) { @@ -77,7 +77,7 @@ ImageDimensions TestPlatformAbstraction::GetClosestImageSize( const std::string& ImageDimensions TestPlatformAbstraction::GetClosestImageSize( Integration::ResourcePointer resourceBuffer, ImageDimensions size, - FittingMode::Type scalingMode, + FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ) { @@ -92,7 +92,7 @@ ImageDimensions TestPlatformAbstraction::GetClosestImageSize( Integration::Resou void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request) { std::ostringstream out; - out << "Type:" << request.GetType()->id << ", Path: " << request.GetPath() << std::endl; + out << "Type:" << request.GetType()->id << ", Path: " << request.GetPath() << std::endl ; mTrace.PushCall("LoadResource", out.str()); if(mRequest != NULL) @@ -193,7 +193,7 @@ void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int d /** * @copydoc PlatformAbstraction::LoadFile() */ -bool TestPlatformAbstraction::LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const +bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const { mTrace.PushCall("LoadFile", ""); if( mLoadFileResult.loadResult ) @@ -205,11 +205,11 @@ bool TestPlatformAbstraction::LoadFile( const std::string& filename, std::vector } /** - * @copydoc PlatformAbstraction::LoadShaderBinFile() + * @copydoc PlatformAbstraction::LoadShaderBinaryFile() */ -bool TestPlatformAbstraction::LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const +bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const { - mTrace.PushCall("LoadShaderBinFile", ""); + mTrace.PushCall("LoadShaderBinaryFile", ""); if( mLoadFileResult.loadResult ) { buffer = mLoadFileResult.buffer; @@ -221,7 +221,7 @@ bool TestPlatformAbstraction::LoadShaderBinFile( const std::string& filename, st /** * @copydoc PlatformAbstraction::SaveFile() */ -bool TestPlatformAbstraction::SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const +bool TestPlatformAbstraction::SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes) const { mTrace.PushCall("SaveFile", ""); return false; @@ -260,7 +260,8 @@ 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 LoadShaderBinaryFileFunc: return mTrace.FindMethod("LoadShaderBinaryFile"); + case SaveShaderBinaryFileFunc: return mTrace.FindMethod("SaveShaderBinaryFile"); case SaveFileFunc: return mTrace.FindMethod("SaveFile"); case CancelLoadFunc: return mTrace.FindMethod("CancelLoad"); case GetResourcesFunc: return mTrace.FindMethod("GetResources"); @@ -346,7 +347,7 @@ void TestPlatformAbstraction::SetClosestImageSize(const Vector2& size) mClosestSize = size; } -void TestPlatformAbstraction::SetLoadFileResult( bool result, std::vector< unsigned char >& buffer ) +void TestPlatformAbstraction::SetLoadFileResult( bool result, Dali::Vector< unsigned char >& buffer ) { mLoadFileResult.loadResult = result; if( result ) 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 3a69ae7..c35b2c2 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 @@ -70,7 +70,7 @@ public: } bool loadResult; - std::vector< unsigned char> buffer; + Dali::Vector< unsigned char> buffer; }; /** @@ -103,7 +103,7 @@ public: */ virtual ImageDimensions GetClosestImageSize( const std::string& filename, ImageDimensions size, - FittingMode::Type scalingMode, + FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ); @@ -112,7 +112,7 @@ public: */ virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer, ImageDimensions size, - FittingMode::Type scalingMode, + FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ); @@ -160,20 +160,24 @@ public: * @copydoc PlatformAbstraction::SetDpi() */ virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical); + /** * @copydoc PlatformAbstraction::LoadFile() */ - virtual bool LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const; + virtual bool LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; /** - * @copydoc PlatformAbstraction::LoadShaderBinFile() + * @copydoc PlatformAbstraction::LoadShaderBinaryFile() */ - virtual bool LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const; + virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer +) const; + + virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; } /** * @copydoc PlatformAbstraction::SaveFile() */ - virtual bool SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const; + virtual bool SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes) const; virtual void JoinLoaderThreads(); @@ -189,7 +193,8 @@ public: // TEST FUNCTIONS SaveResourceFunc, SaveFileFunc, LoadFileFunc, - LoadShaderBinFileFunc, + LoadShaderBinaryFileFunc, + SaveShaderBinaryFileFunc, CancelLoadFunc, GetResourcesFunc, IsLoadingFunc, @@ -239,7 +244,7 @@ public: // TEST FUNCTIONS void SetClosestImageSize(const Vector2& size); - void SetLoadFileResult( bool result, std::vector< unsigned char >& buffer ); + void SetLoadFileResult( bool result, Dali::Vector< unsigned char >& buffer ); void SetSaveFileResult( bool result ); -- 2.7.4