Merge "Fix svace issue - Application Destructor & egl controller debug" into devel...

diff --git a/dali/internal/adaptor/common/application-impl.h b/dali/internal/adaptor/common/application-impl.h
index 700f3a2..2b2e872 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.h
+++ b/dali/internal/adaptor/common/application-impl.h
@@ -466,7 +466,7 @@ protected:
   /**
    * Destructor
    */
-  ~Application() override;
+  virtual ~Application() override;
 
   // Undefined
   Application(const Application&);

diff --git a/dali/internal/graphics/gles-impl/egl-graphics-controller-debug.cpp b/dali/internal/graphics/gles-impl/egl-graphics-controller-debug.cpp
index 4ac58ae..822821a 100644 (file)
--- a/dali/internal/graphics/gles-impl/egl-graphics-controller-debug.cpp
+++ b/dali/internal/graphics/gles-impl/egl-graphics-controller-debug.cpp
@@ -20,6 +20,7 @@
 
 namespace Dali::Graphics
 {
+#if defined(DEBUG_ENABLED)
 std::string DumpCompareOp(Graphics::CompareOp compareOp)
 {
   switch(compareOp)
@@ -369,5 +370,5 @@ bool GraphicsFrameDump::IsDumpFrame()
 
   return dump;
 }
-
+#endif
 } // namespace Dali::Graphics

diff --git a/dali/internal/graphics/gles-impl/egl-graphics-controller-debug.h b/dali/internal/graphics/gles-impl/egl-graphics-controller-debug.h
index c6333f4..ef26df4 100644 (file)
--- a/dali/internal/graphics/gles-impl/egl-graphics-controller-debug.h
+++ b/dali/internal/graphics/gles-impl/egl-graphics-controller-debug.h
@@ -2,7 +2,7 @@
 #define DALI_GRAPHICS_EGL_GRAPHICS_CONTROLLER_DEBUG_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,11 @@
 
 namespace Dali::Graphics
 {
+#if defined(DEBUG_ENABLED)
 /**
- * Struct to manage dumping N command buffers. In this file, "frame" really 
+ * Struct to manage dumping N command buffers. In this file, "frame" really
  * means each call to EglGraphicsController::Flush(), and doesn't necessarily
- * correspond to a complete render frame. 
+ * correspond to a complete render frame.
  */
 struct GraphicsFrameDump
 {
@@ -46,6 +47,7 @@ struct GraphicsFrameDump
   void DumpCommandBuffer(const GLES::CommandBuffer* cmdBuf);
   bool IsDumpFrame();
 };
+#endif
 
 #if defined(DEBUG_ENABLED) && defined(ENABLE_COMMAND_BUFFER_FRAME_DUMP)
 #define DUMP_FRAME_INIT() std::unique_ptr<Dali::Graphics::GraphicsFrameDump> gGraphicsFrameDump(new Dali::Graphics::GraphicsFrameDump)