From de242b018b4003bd90790b86ed780e5f82a062b2 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Sat, 18 Apr 2020 12:43:30 +0900 Subject: [PATCH] replace backend class names. SwRaster to SwEngine GlRaster to GlEngine Change-Id: I3cf70e168b78c64754807a62c221e13c11b95c35 --- src/lib/gl_engine/meson.build | 4 ++-- .../{tvgGlRaster.cpp => tvgGlEngine.cpp} | 22 +++++++++---------- .../{tvgGlRaster.h => tvgGlEngine.h} | 14 ++++++------ src/lib/sw_engine/meson.build | 4 ++-- .../{tvgSwRaster.cpp => tvgSwEngine.cpp} | 22 +++++++++---------- .../{tvgSwRaster.h => tvgSwEngine.h} | 14 ++++++------ src/lib/tvgEngine.cpp | 12 +++++----- src/lib/tvgGlCanvas.cpp | 4 ++-- src/lib/tvgSwCanvas.cpp | 4 ++-- 9 files changed, 50 insertions(+), 50 deletions(-) rename src/lib/gl_engine/{tvgGlRaster.cpp => tvgGlEngine.cpp} (75%) rename src/lib/gl_engine/{tvgGlRaster.h => tvgGlEngine.h} (81%) rename src/lib/sw_engine/{tvgSwRaster.cpp => tvgSwEngine.cpp} (84%) rename src/lib/sw_engine/{tvgSwRaster.h => tvgSwEngine.h} (81%) diff --git a/src/lib/gl_engine/meson.build b/src/lib/gl_engine/meson.build index 2c3fe062..117149a1 100644 --- a/src/lib/gl_engine/meson.build +++ b/src/lib/gl_engine/meson.build @@ -1,6 +1,6 @@ source_file = [ - 'tvgGlRaster.h', - 'tvgGlRaster.cpp', + 'tvgGlEngine.h', + 'tvgGlEngine.cpp', ] glraster_dep = declare_dependency( diff --git a/src/lib/gl_engine/tvgGlRaster.cpp b/src/lib/gl_engine/tvgGlEngine.cpp similarity index 75% rename from src/lib/gl_engine/tvgGlRaster.cpp rename to src/lib/gl_engine/tvgGlEngine.cpp index 50ed465f..9280e347 100644 --- a/src/lib/gl_engine/tvgGlRaster.cpp +++ b/src/lib/gl_engine/tvgGlEngine.cpp @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef _TVG_GL_RASTER_CPP_ -#define _TVG_GL_RASTER_CPP_ +#ifndef _TVG_GL_ENGINE_CPP_ +#define _TVG_GL_ENGINE_CPP_ #include "tvgCommon.h" -#include "tvgGlRaster.h" +#include "tvgGlEngine.h" -static GlRaster* pInst = nullptr; +static GlEngine* pInst = nullptr; struct GlShape { @@ -29,7 +29,7 @@ struct GlShape }; -void* GlRaster::prepare(const ShapeNode& shape, void* data, UpdateFlag flags) +void* GlEngine::prepare(const ShapeNode& shape, void* data, UpdateFlag flags) { //prepare shape data GlShape* sdata = static_cast(data); @@ -42,31 +42,31 @@ void* GlRaster::prepare(const ShapeNode& shape, void* data, UpdateFlag flags) } -int GlRaster::init() +int GlEngine::init() { if (pInst) return -1; - pInst = new GlRaster(); + pInst = new GlEngine(); assert(pInst); return 0; } -int GlRaster::term() +int GlEngine::term() { if (!pInst) return -1; - cout << "GlRaster(" << pInst << ") destroyed!" << endl; + cout << "GlEngine(" << pInst << ") destroyed!" << endl; delete(pInst); pInst = nullptr; return 0; } -GlRaster* GlRaster::inst() +GlEngine* GlEngine::inst() { assert(pInst); return pInst; } -#endif /* _TVG_GL_RASTER_CPP_ */ +#endif /* _TVG_GL_ENGINE_CPP_ */ diff --git a/src/lib/gl_engine/tvgGlRaster.h b/src/lib/gl_engine/tvgGlEngine.h similarity index 81% rename from src/lib/gl_engine/tvgGlRaster.h rename to src/lib/gl_engine/tvgGlEngine.h index 08f750c3..bad52149 100644 --- a/src/lib/gl_engine/tvgGlRaster.h +++ b/src/lib/gl_engine/tvgGlEngine.h @@ -14,25 +14,25 @@ * limitations under the License. * */ -#ifndef _TVG_GL_RASTER_H_ -#define _TVG_GL_RASTER_H_ +#ifndef _TVG_GL_ENGINE_H_ +#define _TVG_GL_ENGINE_H_ namespace tvg { -class GlRaster : public RasterMethod +class GlEngine : public RasterMethod { public: void* prepare(const ShapeNode& shape, void* data, UpdateFlag flags) override; - static GlRaster* inst(); + static GlEngine* inst(); static int init(); static int term(); private: - GlRaster(){}; - ~GlRaster(){}; + GlEngine(){}; + ~GlEngine(){}; }; } -#endif /* _TVG_GL_RASTER_H_ */ +#endif /* _TVG_GL_ENGINE_H_ */ diff --git a/src/lib/sw_engine/meson.build b/src/lib/sw_engine/meson.build index 4937d595..a1bb0e0a 100644 --- a/src/lib/sw_engine/meson.build +++ b/src/lib/sw_engine/meson.build @@ -1,7 +1,7 @@ source_file = [ 'tvgSwCommon.h', - 'tvgSwRaster.h', - 'tvgSwRaster.cpp', + 'tvgSwEngine.h', + 'tvgSwEngine.cpp', 'tvgSwShape.cpp', 'tvgSwRle.cpp', ] diff --git a/src/lib/sw_engine/tvgSwRaster.cpp b/src/lib/sw_engine/tvgSwEngine.cpp similarity index 84% rename from src/lib/sw_engine/tvgSwRaster.cpp rename to src/lib/sw_engine/tvgSwEngine.cpp index a7d2928b..a6ae3e78 100644 --- a/src/lib/sw_engine/tvgSwRaster.cpp +++ b/src/lib/sw_engine/tvgSwEngine.cpp @@ -14,24 +14,24 @@ * limitations under the License. * */ -#ifndef _TVG_SW_RASTER_CPP_ -#define _TVG_SW_RASTER_CPP_ +#ifndef _TVG_SW_ENGINE_CPP_ +#define _TVG_SW_ENGINE_CPP_ #include "tvgSwCommon.h" -#include "tvgSwRaster.h" +#include "tvgSwEngine.h" /************************************************************************/ /* Internal Class Implementation */ /************************************************************************/ -static SwRaster* pInst = nullptr; +static SwEngine* pInst = nullptr; /************************************************************************/ /* External Class Implementation */ /************************************************************************/ -void* SwRaster::prepare(const ShapeNode& shape, void* data, UpdateFlag flags) +void* SwEngine::prepare(const ShapeNode& shape, void* data, UpdateFlag flags) { //prepare shape data SwShape* sdata = static_cast(data); @@ -59,31 +59,31 @@ void* SwRaster::prepare(const ShapeNode& shape, void* data, UpdateFlag flags) } -int SwRaster::init() +int SwEngine::init() { if (pInst) return -1; - pInst = new SwRaster(); + pInst = new SwEngine(); assert(pInst); return 0; } -int SwRaster::term() +int SwEngine::term() { if (!pInst) return -1; - cout << "SwRaster(" << pInst << ") destroyed!" << endl; + cout << "SwEngine(" << pInst << ") destroyed!" << endl; delete(pInst); pInst = nullptr; return 0; } -SwRaster* SwRaster::inst() +SwEngine* SwEngine::inst() { assert(pInst); return pInst; } -#endif /* _TVG_SW_RASTER_CPP_ */ +#endif /* _TVG_SW_ENGINE_CPP_ */ diff --git a/src/lib/sw_engine/tvgSwRaster.h b/src/lib/sw_engine/tvgSwEngine.h similarity index 81% rename from src/lib/sw_engine/tvgSwRaster.h rename to src/lib/sw_engine/tvgSwEngine.h index c690be37..41853525 100644 --- a/src/lib/sw_engine/tvgSwRaster.h +++ b/src/lib/sw_engine/tvgSwEngine.h @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef _TVG_SW_RASTER_H_ -#define _TVG_SW_RASTER_H_ +#ifndef _TVG_SW_ENGINE_H_ +#define _TVG_SW_ENGINE_H_ -class SwRaster : public RasterMethod +class SwEngine : public RasterMethod { public: void* prepare(const ShapeNode& shape, void* data, UpdateFlag flags) override; - static SwRaster* inst(); + static SwEngine* inst(); static int init(); static int term(); private: - SwRaster(){}; - ~SwRaster(){}; + SwEngine(){}; + ~SwEngine(){}; }; -#endif /* _TVG_SW_RASTER_H_ */ +#endif /* _TVG_SW_ENGINE_H_ */ diff --git a/src/lib/tvgEngine.cpp b/src/lib/tvgEngine.cpp index 5f8f533a..d99ee2d2 100644 --- a/src/lib/tvgEngine.cpp +++ b/src/lib/tvgEngine.cpp @@ -18,8 +18,8 @@ #define _TVG_ENGINE_CPP_ #include "tvgCommon.h" -#include "tvgSwRaster.h" -#include "tvgGlRaster.h" +#include "tvgSwEngine.h" +#include "tvgGlEngine.h" /************************************************************************/ /* Internal Class Implementation */ @@ -35,8 +35,8 @@ int Engine::init() noexcept //TODO: Initialize Raster engines by configuration. int ret = 0; - ret |= SwRaster::init(); - ret |= GlRaster::init(); + ret |= SwEngine::init(); + ret |= GlEngine::init(); return ret; } @@ -45,8 +45,8 @@ int Engine::init() noexcept int Engine::term() noexcept { int ret = 0; - ret |= SwRaster::term(); - ret |= GlRaster::term(); + ret |= SwEngine::term(); + ret |= GlEngine::term(); return ret; } diff --git a/src/lib/tvgGlCanvas.cpp b/src/lib/tvgGlCanvas.cpp index 66f54488..7fb9a283 100644 --- a/src/lib/tvgGlCanvas.cpp +++ b/src/lib/tvgGlCanvas.cpp @@ -19,7 +19,7 @@ #include "tvgCommon.h" #include "tvgCanvasBase.h" -#include "tvgGlRaster.h" +#include "tvgGlEngine.h" /************************************************************************/ /* Internal Class Implementation */ @@ -27,7 +27,7 @@ struct GlCanvas::Impl : CanvasBase { - Impl() : CanvasBase(GlRaster::inst()) {} + Impl() : CanvasBase(GlEngine::inst()) {} }; diff --git a/src/lib/tvgSwCanvas.cpp b/src/lib/tvgSwCanvas.cpp index 82da4530..995dac67 100644 --- a/src/lib/tvgSwCanvas.cpp +++ b/src/lib/tvgSwCanvas.cpp @@ -19,7 +19,7 @@ #include "tvgCommon.h" #include "tvgCanvasBase.h" -#include "tvgSwRaster.h" +#include "tvgSwEngine.h" /************************************************************************/ @@ -32,7 +32,7 @@ struct SwCanvas::Impl : CanvasBase int stride = 0; int height = 0; - Impl() : CanvasBase(SwRaster::inst()) {} + Impl() : CanvasBase(SwEngine::inst()) {} };