Delete X11 dependency and enable png image dump

Change-Id: If046b2aad937e2786c1bb63288094caac8c036ff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4ffd88..fc968c7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,8 +77,8 @@ SET(GLES2_SRCS_common
 #SET(HEADERS_common src/coregl_export.h src/coregl_fastpath.h src/coregl_fastpath_state.h src/coregl.h src/coregl_internal.h src/coregl_thread_pthread.h src/coregl_wrappath.h)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkg_common REQUIRED x11)
 pkg_check_modules(dlog REQUIRED dlog)
+pkg_check_modules(libpng REQUIRED libpng)
 
 INCLUDE_DIRECTORIES(${dlog_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${dlog_INCLUDEDIR})

diff --git a/packaging/coregl.spec b/packaging/coregl.spec
index 36d33fd..f4ef326 100644 (file)
--- a/packaging/coregl.spec
+++ b/packaging/coregl.spec
@@ -1,7 +1,7 @@
 %define BYPASS_COREGL 0
 
 Name:                  coregl
-Summary:               CoreGL FastPath Optimization 
+Summary:               CoreGL FastPath Optimization
 Version:               0.1.10
 Release:               02
 ExclusiveArch: %arm
@@ -10,12 +10,9 @@ License:             Apache 2.0
 URL:                   http://www.tizen.org
 Source:                        %{name}-%{version}.tar.gz
 
-%if "%{BYPASS_COREGL}" != "1"
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(x11)
 BuildRequires:  cmake
-%endif
 BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(libpng)
 
 %description
 CoreGL provides the following capabilities:

diff --git a/src/modules/tracepath/coregl_tracepath.c b/src/modules/tracepath/coregl_tracepath.c
index 9086044..6b2125e 100644 (file)
--- a/src/modules/tracepath/coregl_tracepath.c
+++ b/src/modules/tracepath/coregl_tracepath.c
@@ -1128,7 +1128,7 @@ finish:
        return;
 }
 
-#include "png.h"
+#include <png.h>
 
 void *png_lib_handle = NULL;
 
@@ -1187,7 +1187,7 @@ _dump_surface(int force_output, int type, const char *position, Surface_Data *sd
 
        if (!png_lib_handle)
        {
-               png_lib_handle = dlopen("libpng.so.3", RTLD_NOW);
+               png_lib_handle = dlopen("libpng16.so.16", RTLD_NOW);
 
                dl_png_create_write_struct = dlsym(png_lib_handle, "png_create_write_struct");
                dl_png_destroy_write_struct = dlsym(png_lib_handle, "png_destroy_write_struct");

diff --git a/src/modules/tracepath/coregl_tracepath_gl.c b/src/modules/tracepath/coregl_tracepath_gl.c
index 0bd31d6..d4d263d 100644 (file)
--- a/src/modules/tracepath/coregl_tracepath_gl.c
+++ b/src/modules/tracepath/coregl_tracepath_gl.c
@@ -345,6 +345,8 @@ void
 tracepath_glBindTexture(GLenum target, GLuint texture)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
+
+        _COREGL_TRACE_SURFACE(0, 1, "GLBINDTEXTURE");
        _orig_tracepath_glBindTexture(target, texture);
 
        goto finish;
@@ -3896,6 +3898,7 @@ void
 tracepath_glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
+       _COREGL_TRACE_SURFACE(0, 1, "TEXTURE2DOES");
        _orig_tracepath_glEGLImageTargetTexture2DOES(target, image);
        goto finish;