Fix build break

[Issue type] Fix

add 'mv_private.h' for fixing build braek regarding 'dlog.h' and clean up duplicate include.

Change-Id: If5ae377f1bd3ecb53279277ace834d5d4ed1209c
Signed-off-by: sangho park <sangho.g.park@samsung.com>

diff --git a/test/testsuites/common/visualizer/include/mv_util_matrix.h b/test/testsuites/common/visualizer/include/mv_util_matrix.h
index b1ab267..cfb4d2d 100644 (file)
--- a/test/testsuites/common/visualizer/include/mv_util_matrix.h
+++ b/test/testsuites/common/visualizer/include/mv_util_matrix.h
@@ -21,8 +21,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <mv_common.h>
-
 int matrix_translate(float *m, float x, float y, float z);
 int matrix_rotate(float *m, float angle, float x, float y, float z);
 int matrix_scale(float *m, float x, float y, float z);

diff --git a/test/testsuites/common/visualizer/include/mv_util_render_2d.h b/test/testsuites/common/visualizer/include/mv_util_render_2d.h
index ad232a8..9392dfc 100644 (file)
--- a/test/testsuites/common/visualizer/include/mv_util_render_2d.h
+++ b/test/testsuites/common/visualizer/include/mv_util_render_2d.h
@@ -21,14 +21,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 #include <mv_common.h>
-#include "mv_util_matrix.h"
-#include "mv_util_shader.h"
-#include "mv_util_winsys.h"
 
 #ifdef __cplusplus
 #include <cmath>

diff --git a/test/testsuites/common/visualizer/include/mv_util_render_3d.h b/test/testsuites/common/visualizer/include/mv_util_render_3d.h
index fa56cd1..cedcff4 100644 (file)
--- a/test/testsuites/common/visualizer/include/mv_util_render_3d.h
+++ b/test/testsuites/common/visualizer/include/mv_util_render_3d.h
@@ -21,11 +21,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <mv_common.h>
 #include "mv_util_shader.h"
 
 int init_cube(float aspect);

diff --git a/test/testsuites/common/visualizer/include/mv_util_shader.h b/test/testsuites/common/visualizer/include/mv_util_shader.h
index e3b1e55..9a1d619 100644 (file)
--- a/test/testsuites/common/visualizer/include/mv_util_shader.h
+++ b/test/testsuites/common/visualizer/include/mv_util_shader.h
@@ -26,7 +26,6 @@ extern "C" {
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
-#include <mv_common.h>
 
 typedef struct shader_obj_t {
        GLuint program;

diff --git a/test/testsuites/common/visualizer/include/mv_util_visualizer_2d.h b/test/testsuites/common/visualizer/include/mv_util_visualizer_2d.h
index 5c2b400..dc19223 100644 (file)
--- a/test/testsuites/common/visualizer/include/mv_util_visualizer_2d.h
+++ b/test/testsuites/common/visualizer/include/mv_util_visualizer_2d.h
@@ -21,12 +21,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <mv_common.h>
 #include <GLES2/gl2.h>
 
-#include "mv_util_matrix.h"
 #include "mv_util_render_2d.h"
-#include "mv_common.h"
 
 int mv_util_visualizer_2d(mv_source_h source, const char *url);
 

diff --git a/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h b/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h
index caaff5d..7d47e1f 100644 (file)
--- a/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h
+++ b/test/testsuites/common/visualizer/include/mv_util_visualizer_3d.h
@@ -21,10 +21,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <mv_common.h>
 #include <GLES2/gl2.h>
 
-#include "mv_util_matrix.h"
 #include "mv_util_render_2d.h"
 #include "mv_util_render_3d.h"
 

diff --git a/test/testsuites/common/visualizer/src/mv_util_matrix.cpp b/test/testsuites/common/visualizer/src/mv_util_matrix.cpp
index d9098c9..ba01fa5 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_matrix.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_matrix.cpp
@@ -16,7 +16,8 @@
 
 #define _USE_MATH_DEFINES
 #include <math.h>
-
+#include <mv_common.h>
+#include <mv_private.h>
 #include "mv_util_matrix.h"
 
 static float vec3_length(float *v)

diff --git a/test/testsuites/common/visualizer/src/mv_util_render_2d.cpp b/test/testsuites/common/visualizer/src/mv_util_render_2d.cpp
index 6305ec1..810967a 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_render_2d.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_render_2d.cpp
@@ -14,7 +14,16 @@
  * limitations under the License.
  */
 
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <mv_private.h>
+
+#include "mv_util_matrix.h"
 #include "mv_util_render_2d.h"
+#include "mv_util_shader.h"
+#include "mv_util_winsys.h"
 
 static char vs_fill[] = "                             \n\
                                                       \n\

diff --git a/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp b/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp
index 69c1597..ae5f235 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_render_3d.cpp
@@ -16,7 +16,14 @@
 
 #include <stdio.h>
 #include <math.h>
-
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <mv_common.h>
+#include <mv_private.h>
+
+#include "mv_util_matrix.h"
 #include "mv_util_render_2d.h"
 #include "mv_util_render_3d.h"
 

diff --git a/test/testsuites/common/visualizer/src/mv_util_shader.cpp b/test/testsuites/common/visualizer/src/mv_util_shader.cpp
index 178fb35..42bca00 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_shader.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_shader.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <mv_private.h>
 #include "mv_util_shader.h"
 
 GLuint compile_shader_text(GLenum shaderType, const char *text)

diff --git a/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp b/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp
index dc3f44f..b461736 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_visualizer_2d.cpp
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <mv_private.h>
 #include <grpcpp/grpcpp.h>
 
 #include <opencv2/core.hpp>

diff --git a/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp b/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp
index e68dd94..59d79a6 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_visualizer_3d.cpp
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include <mv_private.h>
+#include "mv_util_matrix.h"
 #include "mv_util_visualizer_3d.h"
 
 #define MAX_DEPTH_WIDTH 640

diff --git a/test/testsuites/common/visualizer/src/mv_util_winsys.cpp b/test/testsuites/common/visualizer/src/mv_util_winsys.cpp
index 57dab55..f243621 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_winsys.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_winsys.cpp
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <signal.h>
+#include <mv_private.h>
 #include "wayland-client.h"
 #include "wayland-egl.h"
 #include "mv_util_winsys.h"