diff --git a/AUTHORS b/AUTHORS index 7b4bc356c5..ac1e58d60a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -63,6 +63,52 @@ Lionel Orry Jérôme Pinot Leandro Santiago +Evas +---- + +Carsten Haitzler +Till Adam +Steve Ireland +Brett Nash +Tilman Sauerbeck +Corey Donohoe +Yuri Hudobin +Nathan Ingersoll +Willem Monsuwe +Jose O Gonzalez +Bernhard Nemec +Jorge Luis Zapata Muga +Cedric Bail +Gustavo Sverzut Barbieri +Vincent Torri +Tim Horton +Tom Hacohen +Mathieu Taillefumier +Iván Briano +Gustavo Lima Chaves +Samsung Electronics +Samsung SAIT +Sung W. Park +Jiyoun Park +Myoungwoon Roy Kim(roy_kim) +Thierry el Borgi +Shilpa Singh +ChunEon Park +Christopher 'devilhorns' Michael +Seungsoo Woo +Youness Alaoui +Jim Kukunas +Nicolas Aguirre +Rafal Krypa +Hyoyoung Chang +Jérôme Pinot +Rafael Antognolli +Daniel Zaoui +Christophe Sadoine +Igor Murzov +Sohyun Kim +Boris Faure + Embryo ------ diff --git a/COPYING b/COPYING index 40367789be..4cbd1f8642 100644 --- a/COPYING +++ b/COPYING @@ -5,4 +5,5 @@ evil: licenses/COPYING.BSD eet: licenses/COPYING.BSD eina: licenses/COPYING.LGPL eo: licenses/COPYING.BSD +evas: licenses/COPYING.BSD embryo: licenses/COPYING.BSD diff --git a/Makefile.am b/Makefile.am index 6cca8553b9..45dd848e97 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ MAINTAINERCLEANFILES = \ Makefile.in \ aclocal.m4 \ compile \ +config.cache-env \ config.guess \ config.h.in \ config.h.in~ \ @@ -33,6 +34,7 @@ m4/evil_windows.m4 \ m4/eina_check.m4 EXTRA_DIST += \ +autogen.sh \ licenses/COPYING.LGPL \ licenses/COPYING.GPL \ licenses/COPYING.BSD \ @@ -50,6 +52,19 @@ pc/evil.pc \ pc/eina.pc \ pc/eet.pc \ pc/eo.pc \ +pc/evas.pc \ +pc/evas-directfb.pc \ +pc/evas-fb.pc \ +pc/evas-opengl-x11.pc \ +pc/evas-opengl-sdl.pc \ +pc/evas-software-buffer.pc \ +pc/evas-software-x11.pc \ +pc/evas-software-gdi.pc \ +pc/evas-software-ddraw.pc \ +pc/evas-direct3d.pc \ +pc/evas-psl1ght.pc \ +pc/evas-wayland-shm.pc \ +pc/evas-wayland-egl.pc \ pc/embryo.pc pkgconfigdir = $(libdir)/pkgconfig @@ -63,8 +78,61 @@ pkgconfig_DATA += \ pc/eina.pc \ pc/eo.pc \ pc/eet.pc \ +pc/evas.pc \ pc/embryo.pc +if BUILD_ENGINE_SOFTWARE_X11 +pkgconfig_DATA += pc/evas-software-x11.pc +endif + +if BUILD_ENGINE_DIRECTFB +pkgconfig_DATA += pc/evas-directfb.pc +endif + +if BUILD_ENGINE_FB +pkgconfig_DATA += pc/evas-fb.pc +endif + +if BUILD_ENGINE_BUFFER +pkgconfig_DATA += pc/evas-software-buffer.pc +endif + +if BUILD_ENGINE_GL_X11 +pkgconfig_DATA += pc/evas-opengl-x11.pc +endif + +if BUILD_ENGINE_GL_SDL +pkgconfig_DATA += pc/evas-opengl-sdl.pc +endif + +if BUILD_ENGINE_GL_COCOA +pkgconfig_DATA += pc/evas-opengl-cocoa.pc +endif + +if BUILD_ENGINE_SOFTWARE_GDI +pkgconfig_DATA += pc/evas-software-gdi.pc +endif + +if BUILD_ENGINE_SOFTWARE_DDRAW +pkgconfig_DATA += pc/evas-software-ddraw.pc +endif + +if BUILD_ENGINE_DIRECT3D +pkgconfig_DATA += pc/evas-direct3d.pc +endif + +if BUILD_ENGINE_PSL1GHT +pkgconfig_DATA += pc/evas-psl1ght.pc +endif + +if BUILD_ENGINE_WAYLAND_SHM +pkgconfig_DATA += pc/evas-wayland-shm.pc +endif + +if BUILD_ENGINE_WAYLAND_EGL +pkgconfig_DATA += pc/evas-wayland-egl.pc +endif + .PHONY: doc benchmark examples install-examples diff --git a/configure.ac b/configure.ac index 5e4283bb06..5052cd7f16 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ requirements_libs_evil="" requirements_libs_eina="" requirements_libs_eo="" requirements_libs_eet="" -#requirements_libs_evas="" +requirements_libs_evas="" #requirements_libs_ecore="" requirements_libs_embryo="" #requirements_libs_eio="" @@ -71,7 +71,7 @@ requirements_libs_deps_evil="" requirements_libs_deps_eina="" requirements_libs_deps_eo="" requirements_libs_deps_eet="" -#requirements_libs_deps_evas="" +requirements_libs_deps_evas="" #requirements_libs_deps_ecore="" requirements_libs_deps_embryo="" #requirements_libs_deps_eio="" @@ -86,7 +86,7 @@ requirements_libs_deps_embryo="" requirements_pc_eina="" requirements_pc_eo="" requirements_pc_eet="" -#requirements_pc_evas="" +requirements_pc_evas="" #requirements_pc_ecore="" requirements_pc_embryo="" #requirements_pc_eio="" @@ -101,7 +101,7 @@ requirements_pc_embryo="" requirements_pc_deps_eina="" requirements_pc_deps_eo="" requirements_pc_deps_eet="" -#requirements_pc_deps_evas="" +requirements_pc_deps_evas="" #requirements_pc_deps_ecore="" requirements_pc_deps_embryo="" #requirements_pc_deps_eio="" @@ -117,7 +117,7 @@ AC_SUBST([requirements_libs_evil]) AC_SUBST([requirements_libs_eina]) AC_SUBST([requirements_libs_eo]) AC_SUBST([requirements_libs_eet]) -#AC_SUBST([requirements_libs_evas]) +AC_SUBST([requirements_libs_evas]) #AC_SUBST([requirements_libs_ecore]) AC_SUBST([requirements_libs_embryo]) #AC_SUBST([requirements_libs_eio]) @@ -132,7 +132,7 @@ AC_SUBST([requirements_libs_embryo]) AC_SUBST([requirements_pc_eina]) AC_SUBST([requirements_pc_eo]) AC_SUBST([requirements_pc_eet]) -#AC_SUBST([requirements_pc_evas]) +AC_SUBST([requirements_pc_evas]) #AC_SUBST([requirements_pc_ecore]) AC_SUBST([requirements_pc_embryo]) #AC_SUBST([requirements_pc_eio]) @@ -179,6 +179,7 @@ case "$host_os" in ;; esac +AC_SUBST([MODULE_ARCH]) AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"]) AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects]) @@ -225,6 +226,32 @@ AC_SUBST([release_info]) ### compilers +# rw_PROG_OBJC_WORKS +# Check whether the Objective C compiler works. +AC_DEFUN([rw_PROG_OBJC_WORKS], +[m4_ifdef([AC_PROG_OBJC], [AC_REQUIRE([AC_PROG_OBJC])dnl +AC_CACHE_CHECK([whether the Objective C compiler works], + [rw_cv_prog_objc_works], + [AC_LANG_PUSH([Objective C]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [rw_cv_prog_objc_works=yes], + [rw_cv_prog_objc_works=no]) + AC_LANG_POP([Objective C])])], [rw_cv_prog_objc_works=no]) +]) + +m4_ifdef([AC_PROG_OBJC], + [ + AC_PROG_OBJC + _AM_DEPENDENCIES(OBJC) + ], + [ + dnl#AC_CHECK_TOOL([OBJC], [gcc]) + dnl#AC_SUBST([OBJC]) + dnl#AC_SUBST([OBJCFLAGS]) + ]) + +rw_PROG_OBJC_WORKS + AM_PROG_AS AC_PROG_CXX AC_LANG(C) @@ -263,6 +290,8 @@ siginfo.h \ stdint.h \ strings.h \ sys/types.h \ +sys/param.h \ +sys/mman.h \ unistd.h \ ]) @@ -312,6 +341,11 @@ case "${build_profile}" in ;; esac +EFL_ATTRIBUTE_VECTOR +EFL_ATTRIBUTE_ALWAYS_INLINE + +EFL_LIBS= +AC_SUBST([EFL_LIBS]) #### Checks for linker characteristics @@ -817,6 +851,910 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) #### End of Eo +#### Evas + +AC_MSG_NOTICE([Evas checks]) + +### Additional options to configure + +# when used, that option makes configure script fails when +# a requirement is selected, but not met. +use_strict="no" +AC_ARG_ENABLE([strict], + [AC_HELP_STRING([--enable-strict], [enable strict checking mode. @<:@default==disabled@:>@])], + [use_strict="yes"], + [use_strict="no"]) + +# Simple X11 build/link +AC_ARG_ENABLE([simple-x11], + [AC_HELP_STRING([--enable-simple-x11], + [enable simple x11 linking. @<:@default=disabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_evas_simple_x11="yes" + else + want_evas_simple_x11="no" + fi + ], + [want_evas_simple_x11="no"]) + +# Fontconfig +AC_ARG_ENABLE([fontconfig], + [AC_HELP_STRING([--disable-fontconfig], + [disable fontconfig for finding fonts. @<:@default=enabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_fontconfig="yes" + else + want_fontconfig="no" + fi + ], + [want_fontconfig="yes"]) + +# Fribidi +AC_ARG_ENABLE([fribidi], + [AC_HELP_STRING([--disable-fribidi], + [disable bidirectional text support. @<:@default=enabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_fribidi="yes" + else + want_fribidi="no" + fi + ], + [want_fribidi="yes"]) + +# Harfbuzz +AC_ARG_ENABLE([harfbuzz], + [AC_HELP_STRING([--disable-harfbuzz], + [disable complex text shaping and layouting support. @<:@default=auto@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_harfbuzz="yes" + else + want_harfbuzz="no" + fi + ], + [want_harfbuzz="auto"]) + +# Pixman +AC_ARG_ENABLE([pixman], + [AC_HELP_STRING([--enable-pixman], + [enable pixman for software rendering. @<:@default=disabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_pixman="yes" + else + want_pixman="no" + fi + ], + [want_pixman="yes"]) + +AC_ARG_ENABLE([pixman-font], + [AC_HELP_STRING([--enable-pixman-font], + [Allow pixman to render fonts. @<:@default=disabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + have_pixman_font="yes" + else + have_pixman_font="no" + fi + ], + [have_pixman_font="no"]) + +AC_ARG_ENABLE([pixman-rect], + [AC_HELP_STRING([--enable-pixman-rect], + [Allow pixman to render rects. @<:@default=disabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + have_pixman_rect="yes" + else + have_pixman_rect="no" + fi + ], + [have_pixman_rect="no"]) + +AC_ARG_ENABLE([pixman-line], + [AC_HELP_STRING([--enable-pixman-line], + [Allow pixman to render lines. @<:@default=disabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + have_pixman_line="yes" + else + have_pixman_line="no" + fi + ], + [have_pixman_line="no"]) + +AC_ARG_ENABLE(pixman-poly, + AC_HELP_STRING([--enable-pixman-poly], + [Allow pixman to render polys. @<:@default=disabled@:>@]), + [ + if test "x${enableval}" = "xyes" ; then + have_pixman_poly="yes" + else + have_pixman_poly="no" + fi + ], + [have_pixman_poly="no"]) + +AC_ARG_ENABLE([pixman-image], + [AC_HELP_STRING([--enable-pixman-image], + [Allow pixman to render images. @<:@default=disabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + have_pixman_image="yes" + else + have_pixman_image="no" + fi + ], + [have_pixman_image="no"]) + +AC_ARG_ENABLE([pixman-image-scale-sample], + [AC_HELP_STRING([--enable-pixman-image-scale-sample], + [Allow pixman to render sampled scaled images. @<:@default=disabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + have_pixman_image_scale_sample="yes" + else + have_pixman_image_scale_sample="no" + fi + ], + [have_pixman_image_scale_sample="no"]) + +# Tile rotate +AC_ARG_ENABLE([tile-rotate], + [AC_HELP_STRING([--enable-tile-rotate], + [Enable tiled rotate algorithm. @<:@default=disabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + have_tile_rotate="yes" + else + have_tile_rotate="no" + fi + ], + [have_tile_rotate="no"]) + +# SSE3 +AC_ARG_ENABLE([cpu-sse3], + [AC_HELP_STRING([--enable-cpu-sse3], + [enable SSE3 code. @<:@default=enabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_sse3="yes" + else + want_sse3="no" + fi + ], + [want_sse3="yes"]) + +# Engines + +AC_ARG_ENABLE([software-xcb], + AC_HELP_STRING([--enable-software-xcb], [enable Software XCB Engine. @<:@default=disabled@:>@]), + [ + if test "x$enableval" = "xyes" ; then + want_xcb="yes" + else + want_xcb="no" + fi + ], + [want_xcb="no"]) + +AC_ARG_ENABLE([gl-xcb], + AC_HELP_STRING([--enable-gl-xcb], [enable OpenGL XCB Engine. @<:@default=disabled@:>@]), + [ + if test "x$enableval" = "xyes" ; then + want_gl_xcb="yes" + else + want_gl_xcb="no" + fi + ], + [want_gl_xcb="no"]) + +AC_ARG_ENABLE([static-software-generic], + [AC_HELP_STRING([--enable-static-software-generic], [Build software generic engine as part of libevas. @<:@default=disabled@:>@])], + [ + if test "x$enableval" = "xyes" ; then + have_static_software_generic="yes" + else + have_static_software_generic="no" + fi + ], + [have_static_software_generic="no"]) + +AC_ARG_ENABLE([gl-flavor-gles], + [AC_HELP_STRING([--enable-gl-flavor-gles], [enable gles flavor of gl instead of standard. @<:@default=disabled@:>@])], + [ + if test "x$enableval" = "xyes" ; then + gl_flavor_gles="yes" + else + gl_flavor_gles="no" + fi + ], + [gl_flavor_gles="no"]) + +AC_ARG_ENABLE([sdl-primitive], + [AC_HELP_STRING([--enable-sdl-primitive], [enable SDL primitives. @<:@default=disabled@:>@])], + [ + if test "x$enableval" = "xyes" ; then + sdl_primitive="yes" + else + sdl_primitive="no" + fi + ], + [sdl_primitive="no"]) + +# Loaders + +AC_ARG_ENABLE([image-loader-gif], + [AC_HELP_STRING([--enable-image-loader-gif], [enable Gif image loader. @<:@default=enabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_evas_image_loader_gif="yes" + else + if test "x${enableval}" = "xstatic" ; then + want_evas_image_loader_gif="static" + else + want_evas_image_loader_gif="no" + fi + fi + ], + [want_evas_image_loader_gif="yes"]) + +AC_ARG_ENABLE([image-loader-svg], + [AC_HELP_STRING([--enable-image-loader-svg], [enable SVG image loader. @<:@default=enabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_evas_image_loader_svg="yes" + else + if test "x${enableval}" = "xstatic" ; then + want_evas_image_loader_svg="static" + else + want_evas_image_loader_svg="no" + fi + fi + ], + [want_evas_image_loader_svg="yes"]) + +AC_ARG_ENABLE([image-loader-tiff], + [AC_HELP_STRING([--enable-image-loader-tiff], [enable Tiff image loader. @<:@default=enabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_evas_image_loader_tiff="yes" + else + if test "x${enableval}" = "xstatic" ; then + want_evas_image_loader_tiff="static" + else + want_evas_image_loader_tiff="no" + fi + fi + ], + [want_evas_image_loader_tiff="yes"]) + +AC_ARG_ENABLE([image-loader-webp], + [AC_HELP_STRING([--enable-image-loader-webp], [enable WEBP image loader. @<:@default=enabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_evas_image_loader_webp="yes" + else + if test "x${enableval}" = "xstatic" ; then + want_evas_image_loader_webp="static" + else + want_evas_image_loader_webp="no" + fi + fi + ], + [want_evas_image_loader_webp="yes"]) + +### Default values + +want_evas_cserve2="yes" + +want_evas_engine_buffer="yes" +want_evas_engine_software_xlib="no" +want_evas_engine_software_xcb="no" +want_evas_engine_software_gdi="no" +want_evas_engine_software_ddraw="no" +want_evas_engine_gl_xlib="no" +want_evas_engine_gl_xcb="no" +want_evas_engine_gl_sdl="no" +want_evas_engine_gl_cocoa="no" +want_evas_engine_direct3d="no" +want_evas_engine_fb="no" +want_evas_engine_directfb="no" +want_evas_engine_psl1ght="no" +want_evas_engine_wayland_shm="no" +want_evas_engine_wayland_egl="no" + +want_evas_image_loader_bmp="static" +want_evas_image_loader_eet="static" +want_evas_image_loader_generic="static" +#want_evas_image_loader_gif="yes" +want_evas_image_loader_ico="static" +want_evas_image_loader_jpeg="static" +want_evas_image_loader_pmaps="static" +want_evas_image_loader_png="static" +want_evas_image_loader_psd="static" +#want_evas_image_loader_svg="yes" +want_evas_image_loader_tga="static" +#want_evas_image_loader_tiff="yes" +want_evas_image_loader_wbmp="static" +#want_evas_image_loader_webp="yes" +want_evas_image_loader_xpm="static" + +case "$host_os" in + mingw32ce*) + want_fontconfig="no" + want_evas_image_loader_gif="no" + want_evas_image_loader_svg="no" + want_evas_image_loader_tiff="no" + want_evas_image_loader_webp="no" + ;; + mingw*) + want_evas_engine_software_gdi="yes" + want_evas_engine_software_ddraw="yes" + want_evas_engine_direct3d="yes" + ;; + darwin*) + want_evas_engine_software_xlib="auto" + want_evas_engine_gl_cocoa="auto" + ;; + *) + want_evas_engine_software_xlib="auto" + want_evas_engine_gl_xlib="auto" + want_evas_engine_software_xcb="no" + want_evas_engine_gl_xcb="no" + want_evas_engine_fb="auto" + want_evas_engine_wayland_shm="auto" + want_evas_engine_wayland_egl="auto" + ;; +esac + +EFL_CHECK_FUNC([DLSYM], [dlsym]) +requirements_libs_deps_evas="${requirements_libs_deps_evas} ${DLSYM_LIBS}" + +if test "x${efl_func_dlsym}" = "xno" ; then + want_evas_engine_gl_xlib="no" + want_evas_engine_gl_xcb="no" + want_evas_engine_gl_sdl="no" +fi + +case "$host_vendor" in + ps3*) + want_evas_engine_psl1ght="static" + ;; +esac + +### Checks for programs + +### Checks for libraries + +## Compatibility layers + +# Evil library for compilation on Windows + +case "$host_os" in + mingw*) + requirements_pc_evas="${requirements_pc_evas} evil >= ${PACKAGE_VERSION}" + ;; +esac + +# Eina, Eo and Eet libraries + +requirements_pc_evas="eo >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_evas}" + +# Freetype +PKG_CHECK_EXISTS([freetype2 >= 9.3.0], + [requirements_pc_evas="freetype2 >= 9.3.0 ${requirements_pc_evas}"]) + +requirements_pc_deps_evas="freetype2 ${requirements_pc_deps_evas}" + +## optional dependencies + +# FontConfig +have_fontconfig="no" +if test "x${want_fontconfig}" = "xyes"; then + PKG_CHECK_EXISTS([fontconfig >= 2.5.0], + [ + have_fontconfig="yes" + AC_DEFINE(HAVE_FONTCONFIG, 1, [have fontconfig searching capabilities]) + requirements_pc_evas="fontconfig ${requirements_pc_evas}" + requirements_pc_deps_evas="fontconfig ${requirements_pc_deps_evas}" + ]) +fi + +# fribidi support +have_fribidi="no" +if test "x${want_fribidi}" = "xyes"; then + PKG_CHECK_EXISTS([fribidi >= 0.19.2], + [ + have_fribidi="yes" + AC_DEFINE([HAVE_FRIBIDI], [1], [have fribidi support]) + requirements_pc_evas="fribidi ${requirements_pc_evas}" + requirements_pc_deps_evas="fribidi ${requirements_pc_deps_evas}" + CPPFLAGS_SAVE="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $FRIBIDI_CFLAGS" + AC_CHECK_SIZEOF([FriBidiChar], [], [#include ]) + CPPFLAGS="$CPPFLAGS_SAVE" + ]) +fi + +# harfbuzz support +have_harfbuzz="no" +have_harfbuzz_ft="no" +if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then + PKG_CHECK_EXISTS([harfbuzz >= 0.9.0], + [ + have_harfbuzz="yes" + requirements_pc_evas="harfbuzz ${requirements_pc_evas}" + requirements_pc_deps_evas="harfbuzz ${requirements_pc_deps_evas}" + ], + [ + if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then + AC_MSG_ERROR([Harfbuzz not found (strict dependencies checking)]) + fi + ]) +fi + +if test "x${have_harfbuzz}" = "xno"; then + HAS_HARFBUZZ=0 +fi + +# Pixman +have_pixman="no" +if test "x${want_pixman}" = "xyes" || test "x${want_pixman}" = "xauto" ; then + PKG_CHECK_EXISTS([pixman-1], + [ + have_pixman="yes" + AC_DEFINE([HAVE_PIXMAN], [1], [have pixman for rendering]) + requirements_pc_evas="pixman-1 ${requirements_pc_evas}" + requirements_pc_deps_evas="pixman-1 ${requirements_pc_deps_evas}" + ], + [ + if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then + AC_MSG_ERROR([Pixman not found (strict dependencies checking)]) + fi + ]) +fi + +if test "x${have_pixman}" = "xyes" ; then + if test "x${have_pixman_font}" = "xyes" ; then + AC_DEFINE(PIXMAN_FONT, 1, [Allow pixman to render fonts]) + fi + if test "x${have_pixman_rect}" = "xyes" ; then + AC_DEFINE(PIXMAN_RECT, 1, [Allow pixman to render rects]) + fi + if test "x${have_pixman_line}" = "xyes" ; then + AC_DEFINE(PIXMAN_LINE, 1, [Allow pixman to render lines]) + fi + if test "x${have_pixman_poly}" = "xyes" ; then + AC_DEFINE(PIXMAN_POLY, 1, [Allow pixman to render polys]) + fi + if test "x${have_pixman_image}" = "xyes" ; then + AC_DEFINE(PIXMAN_IMAGE, 1, [Allow pixman to render images]) + fi + if test "x${have_pixman_image_scale_sample}" = "xyes" ; then + AC_DEFINE(PIXMAN_IMAGE_SCALE_SAMPLE, 1, [Allow pixman to render image sampled scaling]) + fi +fi + +## Engines + +EVAS_CHECK_ENGINE([buffer], [${want_evas_engine_buffer}], [yes], [Buffer]) +EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D]) +EVAS_CHECK_ENGINE([directfb], [${want_evas_engine_directfb}], [no], [DirectFB]) +EVAS_CHECK_ENGINE([fb], [${want_evas_engine_fb}], [no], [Framebuffer]) +EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa]) +EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL]) +EVAS_CHECK_ENGINE([psl1ght], [${want_evas_engine_psl1ght}], [no], [PSL1GHT]) +EVAS_CHECK_ENGINE([software-gdi], [${want_evas_engine_software_gdi}], [no], [Software GDI]) +EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no], [Software DirectDraw]) +EVAS_CHECK_ENGINE([wayland-shm], [${want_evas_engine_wayland_shm}], [no], [Wayland Shm]) +EVAS_CHECK_ENGINE([wayland-egl], [${want_evas_engine_wayland_egl}], [no], [Wayland Egl]) + +# Software XCB + +have_evas_engine_software_xcb="no" +if test "x${want_xcb}" = "xyes" ; then + EVAS_CHECK_ENGINE([software-xcb], [${want_evas_engine_software_xcb}], [no], [Software XCB]) +else + AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XCB], [false]) + AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XCB], [false]) +fi + +AC_MSG_CHECKING([whether to build Software XCB Engine]) +AC_MSG_RESULT([${have_evas_engine_software_xcb}]) + +# No Software XCB ? Then try Software Xlib + +have_evas_engine_software_xlib="no" +if test "x${have_evas_engine_software_xcb}" = "xno" ; then + EVAS_CHECK_ENGINE([software-xlib], [${want_evas_engine_software_xlib}], [no], [Software Xlib]) +else + AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XLIB], [false]) + AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [false]) +fi + +AC_MSG_CHECKING([whether to build Software Xlib Engine]) +AC_MSG_RESULT([${have_evas_engine_software_xlib}]) + +# If software_x11 is available, define everything needed for X11 + +have_evas_engine_software_x11="no" +if test "x${have_evas_engine_software_xlib}" = "xyes" || test "x${have_evas_engine_software_xcb}" = "xyes" ; then + have_evas_engine_software_x11="yes" + AC_DEFINE_UNQUOTED([BUILD_ENGINE_SOFTWARE_X11], [1], [Build software X11 engine]) +fi +AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [test "x${have_evas_engine_software_x11}" = "xyes"]) + +if test "x${have_evas_engine_software_xlib}" = "xstatic" || test "x${have_evas_engine_software_xcb}" = "xstatic"; then + AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_SOFTWARE_X11], [1], [Build software X11 engine as part of libevas]) +fi +AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [test "x${have_evas_engine_software_xcb}" = "xstatic" || test "x${have_evas_engine_software_xlib}" = "xstatic"]) + +# Needed for evas-software-x11.pc + +AC_SUBST([have_evas_engine_software_xlib]) +AC_SUBST([have_evas_engine_software_xcb]) + +# Software generic + +AC_MSG_CHECKING([Whether to build software generic engine as part of libevas]) +AC_MSG_RESULT([${have_static_software_generic}]) + +if test "x${have_static_module}" = "xyes" && test "x${have_static_software_generic}" = "xno"; then + AC_MSG_WARN([Forcing --enable-static-software-generic as engines must be compiled statically]) + have_static_software_generic="yes" +fi + +if test "x${have_static_software_generic}" = "xyes"; then + AC_DEFINE([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [1], [Build software generic engine as part of libevas]) +fi + +AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [test "x${have_static_software_generic}" = "xyes"]) + +# OpenGL + +AC_MSG_CHECKING([whether to build GLES flavor of GL]) +AC_MSG_RESULT([${gl_flavor_gles}]) + +if test "x${gl_flavor_gles}" = "xyes" ; then + AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support]) +fi + +# OpenGL XCB + +have_evas_engine_gl_xcb="no" +if test "x${want_gl_xcb}" = "xyes" ; then + EVAS_CHECK_ENGINE([gl-xcb], [${want_evas_engine_gl_xcb}], [no], [OpenGL XCB]) +else + AM_CONDITIONAL([BUILD_ENGINE_GL_XCB], [false]) + AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XCB], [false]) +fi + +AC_MSG_CHECKING([whether to build OpenGL XCB Engine]) +AC_MSG_RESULT([${have_evas_engine_gl_xcb}]) + +# No openGL XCB ? Then try OpenGL Xlib + +have_evas_engine_gl_xlib="no" +if test "x${have_evas_engine_gl_xcb}" = "xno" ; then + EVAS_CHECK_ENGINE([gl-xlib], [${want_evas_engine_gl_xlib}], [no], [OpenGL XLib]) +else + AM_CONDITIONAL([BUILD_ENGINE_GL_XLIB], [false]) + AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XLIB], [false]) +fi + +AC_MSG_CHECKING([whether to build OpenGL Xlib Engine]) +AC_MSG_RESULT([${have_evas_engine_gl_xlib}]) + +# If opengl_x11 is available, define everything needed for X11 + +have_evas_engine_gl_x11="no" +if test "x${have_evas_engine_gl_xlib}" = "xyes" || test "x${have_evas_engine_gl_xcb}" = "xyes" ; then + have_evas_engine_gl_x11="yes" + AC_DEFINE_UNQUOTED([BUILD_ENGINE_GL_X11], [1], [Build OpenGL X11 engine]) +fi +AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [test "x${have_evas_engine_gl_x11}" = "xyes"]) + +if test "x${have_evas_engine_gl_xlib}" = "xstatic" || test "x${have_evas_engine_gl_xcb}" = "xstatic"; then + AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_GL_X11], [1], [Build OpenGL X11 engine as part of libevas]) +fi +AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [test "x${have_evas_engine_gl_xcb}" = "xstatic" || test "x${have_evas_engine_gl_xlib}" = "xstatic"]) + +# Needed for evas-opengl-x11.pc + +AC_SUBST([have_evas_engine_gl_xlib]) +AC_SUBST([have_evas_engine_gl_xcb]) + +# OpenGL SDL + +if test "x$have_evas_engine_gl_sdl" = "xyes" || test "x$have_evas_engine_gl_sdl" = "xstatic" ; then + AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION], + [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version attributes present])],, + [#include ]) +fi + +if test "x${gl_flavor_gles}" = "xyes"; then + AC_CHECK_DECL([SDL_OPENGLES], + [AC_DEFINE([HAVE_SDL_FLAG_OPENGLES], [1], [SDL_OPENGLES flag is present])],, + [#include ]) +fi + +# OpenGL common +evas_engine_gl_common_cflags="" +evas_engine_gl_common_libs="" +AC_SUBST([evas_engine_gl_common_cflags]) +AC_SUBST([evas_engine_gl_common_libs]) + +have_evas_engine_gl_common="no" +have_static_evas_engine_gl_common="no" +if test "x$have_evas_engine_gl_xlib" = "xyes" || \ + test "x$have_evas_engine_gl_xcb" = "xyes" || \ + test "x$have_evas_engine_gl_sdl" = "xyes" || \ + test "x$have_evas_engine_gl_cocoa" = "xyes" || \ + test "x$have_evas_engine_wayland_egl" = "xyes"; then + have_evas_engine_gl_common="yes" +fi +if test "x$have_evas_engine_gl_xlib" = "xstatic" || \ + test "x$have_evas_engine_gl_xcb" = "xstatic" || \ + test "x$have_evas_engine_gl_sdl" = "xstatic" || \ + test "x$have_evas_engine_gl_cocoa" = "xstatic" || \ + test "x$have_evas_engine_wayland_egl" = "xstatic"; then + have_evas_engine_gl_common="yes" + have_static_evas_engine_gl_common="yes" +fi + +if test "x${have_evas_engine_gl_common}" = "xyes"; then + AC_DEFINE([BUILD_ENGINE_GL_COMMON], [1], [Generic OpenGL Rendering Support]) +fi + +AM_CONDITIONAL([BUILD_ENGINE_GL_COMMON], [test "x$have_evas_engine_gl_common" = "xyes"]) + +if test "x${have_static_evas_engine_gl_common}" = "xyes"; then + AC_DEFINE([EVAS_STATIC_BUILD_GL_COMMON], [1], [Build GL generic engine as part of libevas]) +fi + +AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [test "x${have_static_evas_engine_gl_common}" = "xyes"]) + +# SDL + +AC_MSG_CHECKING([whether to use SDL primitive when possible]) +AC_MSG_RESULT([${sdl_primitive}]) + +if test "x${sdl_primitive}" = "xyes" ; then + AC_DEFINE([ENGINE_SDL_PRIMITIVE], [1], [Use SDL primitive when possible]) +fi + +## Image Loaders + +EVAS_CHECK_IMAGE_LOADER([BMP], [${want_evas_image_loader_bmp}]) +EVAS_CHECK_IMAGE_LOADER([Eet], [${want_evas_image_loader_eet}]) +EVAS_CHECK_IMAGE_LOADER([Generic], [${want_evas_image_loader_generic}]) +EVAS_CHECK_IMAGE_LOADER([Gif], [${want_evas_image_loader_gif}]) +EVAS_CHECK_IMAGE_LOADER([ICO], [${want_evas_image_loader_ico}]) +EVAS_CHECK_IMAGE_LOADER([JPEG], [${want_evas_image_loader_jpeg}]) +EVAS_CHECK_IMAGE_LOADER([PMAPS], [${want_evas_image_loader_pmaps}]) +EVAS_CHECK_IMAGE_LOADER([PNG], [${want_evas_image_loader_png}]) +EVAS_CHECK_IMAGE_LOADER([PSD], [${want_evas_image_loader_psd}]) +EVAS_CHECK_IMAGE_LOADER([SVG], [${want_evas_image_loader_svg}]) +EVAS_CHECK_IMAGE_LOADER([Tga], [${want_evas_image_loader_tga}]) +EVAS_CHECK_IMAGE_LOADER([Tiff], [${want_evas_image_loader_tiff}]) +EVAS_CHECK_IMAGE_LOADER([WBMP], [${want_evas_image_loader_wbmp}]) +EVAS_CHECK_IMAGE_LOADER([WEBP], [${want_evas_image_loader_webp}]) +EVAS_CHECK_IMAGE_LOADER([XPM], [${want_evas_image_loader_xpm}]) + +dnl Windows has no sigsetjmp function, nor equivalent. +dnl So we disable the jpeg saver. +dnl TODO: must find a workaround +case "$host_os" in + mingw*) + ;; + *) + if test "x${have_evas_image_loader_jpeg}" = "xyes" ; then + AC_DEFINE([EVAS_BUILD_SAVER_JPEG], [1], [Build JPEG saver]) + have_evas_image_saver_jpeg="yes" + fi + ;; +esac + +AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"]) + +PKG_CHECK_MODULES([EVAS], [${requirements_pc_deps_evas}]) + +EVAS_LIBS="${EVAS_LIBS} ${requirements_libs_deps_evas}" + +### Checks for header files + +if test "x$have_harfbuzz" = "xyes" ; then + + CPPFLAGS_SAVE="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $EVAS_CFLAGS" +# must have for usage with harfbuzz although harfbuzz may not have it. + + AC_CHECK_HEADER([hb-ft.h], + [ + have_harfbuzz_ft="yes" + #Depend on harfbuzz ft for harfbuzz support + AC_DEFINE([HAVE_HARFBUZZ], [1], [have harfbuzz support]) + ], + [ + if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then + AC_MSG_ERROR([Harfbuzz-ft not found (strict dependencies checking)]) + fi + have_harfbuzz="no" + ]) + CPPFLAGS="$CPPFLAGS_SAVE" +fi + +### Checks for types + +CPPFLAGS_SAVE="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS -Isrc/lib/eina" +AC_CHECK_SIZEOF([Eina_Unicode], [], [#include ]) +CPPFLAGS="$CPPFLAGS_SAVE" + +### Checks for structures + +AC_CHECK_TYPES([struct sigaction], [], [], + [[#include ]]) + +### Checks for compiler characteristics + +### Checks for linker characteristics + +### Checks for library functions + +AC_CHECK_FUNCS([siglongjmp]) + +res=no +AC_CHECK_LIB([m], [lround], [res=yes], [res=no]) +if test "x${res}" = "xyes" ; then + AC_DEFINE([HAVE_LROUND], [1], [C99 lround function exists]) +fi + +if test "x${want_evas_image_loader_generic}" = "xyes" || test "x${want_evas_cserve2}" = "xyes" ; then + EFL_CHECK_FUNC([EVAS], [shm_open]) +fi + +# cserve2 only works on Linux so far. + +if test "x${efl_func_shm_open}" = "xno" ; then + want_evas_cserve2="no" +fi + +if test "x${want_evas_cserve2}" = "xyes" ; then + AC_CHECK_HEADERS([sys/epoll.h sys/inotify.h sys/signalfd.h], + [], + [want_evas_cserve2="no"]) +fi + +if test "x${want_evas_cserve2}" = "xyes" ; then + AC_DEFINE([EVAS_CSERVE2], [1], [Shared cache server.]) +fi +AM_CONDITIONAL([EVAS_CSERVE2], [test "x${want_evas_cserve2}" = "xyes"]) + +### Configuration + +## Tile rotation + +if test "x${have_tile_rotate}" = "xyes" ; then + AC_DEFINE(TILE_ROTATE, 1, [Enable tiled rotate algorithm]) +fi + +## CPU architecture specific assembly + +build_cpu_mmx="no" +build_cpu_sse3="no" +build_cpu_altivec="no" +build_cpu_neon="no" + +case $host_cpu in + i*86|x86_64|amd64) + AC_DEFINE([BUILD_MMX], [1], [Build MMX Code]) + build_cpu_mmx="yes" + build_cpu_sse3="yes" + ;; + *power* | *ppc*) + build_cpu_altivec="yes" + AC_CHECK_HEADER([altivec.h], + [ + AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) + AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file]) + build_cpu_altivec="yes" + ], + [ + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$CFLAGS" -maltivec" + CPPFLAGS=$CPPFLAGS" -maltivec" + unset ac_cv_header_altivec_h + AC_CHECK_HEADER([altivec.h], + [ + AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) + AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file]) + build_cpu_altivec="yes" + ], + [build_cpu_altivec="no"] + ) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS + ] + ) + if test "x${build_cpu_altivec}" = "xyes"; then + AC_MSG_CHECKING([whether to use altivec compiler flag]) + if test "x$GCC" = "xyes"; then + if echo "int main(){return 0;}" | ${CPP} -faltivec - > /dev/null 2>&1; then + altivec_cflags="-faltivec" + AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) + elif echo "int main(){return 0;}" | ${CPP} -maltivec - > /dev/null 2>&1; then + altivec_cflags="-maltivec" + AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) + fi + fi + AC_MSG_RESULT([${altivec_cflags}]) + CFLAGS="$CFLAGS ${altivec_cflags}" + fi + ;; + arm*) + build_cpu_neon="yes" + AC_MSG_CHECKING([whether to use NEON instructions]) + AC_TRY_COMPILE([#include ], + [asm volatile ("vqadd.u8 d0, d1, d0\n")], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE([BUILD_NEON], [1], [Build NEON Code]) + build_cpu_neon="yes" + ], + [ + AC_MSG_RESULT([no]) + build_cpu_neon="no" + ]) + ;; +esac + +AC_SUBST([altivec_cflags]) + +# SSE3 + +if test "x${want_sse3}" = "xyes" && test "x${build_cpu_sse3}" = "xyes" ; then + AC_CHECK_HEADER([immintrin.h], + [AC_DEFINE(BUILD_SSE3, 1, [Build SSE3 Code])], + [build_cpu_sse3="no"]) +else + build_cpu_sse3="no" +fi + +AC_MSG_CHECKING([whether to build sse3 code]) +AC_MSG_RESULT([${build_cpu_sse3}]) + +EVAS_SSE3_CFLAGS=" " +EVAS_ALTIVEC_CFLAGS=" " + +if test "x$build_cpu_sse3" = "xyes" ; then + EVAS_SSE3_CFLAGS="-msse3" +fi +if test "x$build_cpu_altivec" = "xyes" ; then + EVAS_ALTIVEC_CFLAGS="-maltivec" +fi + +AC_SUBST([CFLAGS]) +AC_SUBST([EVAS_ALTIVEC_CFLAGS]) +AC_SUBST([EVAS_SSE3_CFLAGS]) + +## dither options + +# Small dither mask instead of big one (lower quality) +EVAS_CHECK_DITHER([small-dither-mask], [small dither mask], [conv_small_dither="yes"], [conv_small_dither="no"]) +# Alternate Line dither mask instead of big one (lower quality - but fastest) +EVAS_CHECK_DITHER([line-dither-mask], [line dither mask], [conv_line_dither="yes"], [conv_line_dither="no"]) +# No dither mask at all for 16bpp +EVAS_CHECK_DITHER([no-dither-mask], [conversion to 16bpp without dither mask], [conv_no_dither="yes"], [conv_no_dither="no"]) + +#### End of Evas + + #### Embryo AC_MSG_NOTICE([Embryo checks]) @@ -887,8 +1825,6 @@ src/examples/eina/Makefile src/examples/eet/Makefile src/examples/eo/Makefile src/lib/eina/eina_config.h -src/scripts/Makefile -src/scripts/eina/Makefile src/tests/Makefile src/tests/eina/Makefile src/tests/eet/Makefile @@ -899,6 +1835,21 @@ pc/eina.pc pc/eet.pc pc/eo.pc pc/embryo.pc +pc/evas-direct3d.pc +pc/evas-directfb.pc +pc/evas-fb.pc +pc/evas-opengl-x11.pc +pc/evas-opengl-sdl.pc +pc/evas-opengl-cocoa.pc +pc/evas-psl1ght.pc +pc/evas-software-buffer.pc +pc/evas-software-x11.pc +pc/evas-software-gdi.pc +pc/evas-software-ddraw.pc +pc/evas-software-sdl.pc +pc/evas-wayland-shm.pc +pc/evas-wayland-egl.pc +pc/evas.pc ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 6ab1f988af..e3dc4c262c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,9 @@ MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/embryo/include -files_DATA = embryo/default.inc +embryofilesdir = $(datadir)/embryo/include +embryofiles_DATA = embryo/default.inc -EXTRA_DIST = $(files_DATA) +evasfilesdir = $(datadir)/evas +evasfiles_DATA = evas/checkme + +EXTRA_DIST = embryo/default.inc evas/checkme diff --git a/legacy/evas/data/checkme b/data/evas/checkme similarity index 100% rename from legacy/evas/data/checkme rename to data/evas/checkme diff --git a/m4/efl_attribute.m4 b/m4/efl_attribute.m4 index cd42e9cda6..4f31d93175 100644 --- a/m4/efl_attribute.m4 +++ b/m4/efl_attribute.m4 @@ -29,4 +29,55 @@ if test "x${have_attribute_vector}" = "xyes" ; then fi ]) +dnl Usage: EFL_ATTRIBUTE_ALWAYS_INLINE +dnl call AC_DEFINE for alway_inline if __attribute__((always_inline)) is available + +AC_DEFUN([EFL_ATTRIBUTE_ALWAYS_INLINE], +[ + +have_attribute_forceinline="no" + +AC_MSG_CHECKING([for __forceinline]) + +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +static __forceinline void foo(void) {} + ]], + [[ + ]])], + [ + have_attribute_always_inline="yes" + have_attribute_forceinline="yes" + ], + [have_attribute_always_inline="no"]) + +AC_MSG_RESULT([${have_attribute_always_inline}]) + +if test "x${have_attribute_always_inline}" = "xno" ; then + AC_MSG_CHECKING([for __attribute__ ((__always_inline__))]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +static __attribute__((__always_inline__)) inline void foo(void) {} + ]], + [[ + ]])], + [have_attribute_always_inline="yes"], + [have_attribute_always_inline="no"]) + AC_MSG_RESULT([${have_attribute_always_inline}]) +fi + +if test "x${have_attribute_always_inline}" = "xyes" ; then + if test "x${have_attribute_forceinline}" = "xyes" ; then + AC_DEFINE([EFL_ALWAYS_INLINE], [__forceinline], [Macro declaring a function to always be inlined.]) + else + AC_DEFINE([EFL_ALWAYS_INLINE], [__attribute__ ((__always_inline__)) inline], [Macro declaring a function to always be inlined.]) + fi +else + AC_DEFINE([EFL_ALWAYS_INLINE], [static inline], [Macro declaring a function to always be inlined.]) +fi +]) + dnl End of efl_attribute.m4 diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4 index 23712bcdd7..109ad067d5 100644 --- a/m4/efl_check_funcs.m4 +++ b/m4/efl_check_funcs.m4 @@ -53,11 +53,14 @@ LIBS="${LIBS} $2" AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[ -#define _GNU_SOURCE +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif +#include #include ]], [[ -int res = dladdr(0, 0); +int res = dladdr(NULL, NULL); ]])], [ m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2" @@ -171,6 +174,75 @@ m4_popdef([DOWNEFL]) m4_popdef([UPEFL]) ]) +dnl _EFL_CHECK_FUNC_DLSYM_PRIV is for internal use +dnl _EFL_CHECK_FUNC_DLSYM_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_DLSYM_PRIV], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +LIBS_save="${LIBS}" +LIBS="${LIBS} $2" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif +#include +#include + ]], + [[ +void *res = dlsym(NULL, NULL); + ]])], + [ + m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2" + _efl_have_fct="yes" + ], + [_efl_have_fct="no"]) + +LIBS="${LIBS_save}" + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_FUNC_DLSYM is for internal use +dnl _EFL_CHECK_FUNC_DLSYM(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_DLSYM], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +case "$host_os" in + mingw*) + _efl_have_fct="yes" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" + ;; + *) + _efl_have_fct="no" + +dnl Check is dlsym is in libc + _EFL_CHECK_FUNC_DLSYM_PRIV([$1], [], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + +dnl Check is dlopen is in libdl + if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_DLSYM_PRIV([$1], [-ldl], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + fi + ;; +esac + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + dnl _EFL_CHECK_FUNC_FNMATCH_PRIV is for internal use dnl _EFL_CHECK_FUNC_FNMATCH_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) diff --git a/m4/eina_config.m4 b/m4/eina_config.m4 index 3a0e50b526..609e4f9c74 100644 --- a/m4/eina_config.m4 +++ b/m4/eina_config.m4 @@ -4,5 +4,5 @@ AC_DEFUN([EINA_CONFIG], if $2; then EINA_CONFIGURE_$1="#define EINA_$1" fi -AC_SUBST(EINA_CONFIGURE_$1) +AC_SUBST([EINA_CONFIGURE_$1]) ]) diff --git a/legacy/evas/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 similarity index 81% rename from legacy/evas/m4/evas_check_engine.m4 rename to m4/evas_check_engine.m4 index f79634db45..78c4acccd3 100644 --- a/legacy/evas/m4/evas_check_engine.m4 +++ b/m4/evas_check_engine.m4 @@ -53,6 +53,11 @@ if test "x${have_dep}" = "xyes" ; then evas_engine_[]$1[]_libs="${x_libs}" fi +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi + AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) @@ -123,15 +128,15 @@ if test "x${have_dep}" = "xyes" ; then fi if test "x${have_dep}" = "xyes" ; then - AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib) + AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lX11 -lXext -lXrender -lm $gl_pt_lib]) fi -if test "x$gl_flavor_gles" = "xyes" ; then +if test "x${gl_flavor_gles}" = "xyes" ; then have_dep=no fi if test "x${have_dep}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then if test "x$2" = "xyes" ; then x_libs="${x_libs} -lX11 -lXext -lXrender" @@ -168,7 +173,7 @@ else if test "x${have_egl}" = "xyes" ; then AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) if test "x${have_glesv2}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then evas_engine_[]$1[]_cflags="${x_cflags}" evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" @@ -181,6 +186,11 @@ else fi fi +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi + AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) @@ -208,20 +218,20 @@ PKG_CHECK_MODULES([XCB], [ have_dep="yes" requirement="xcb xcb-shm xcb-image pixman-1" - evas_engine_[]$1[]_cflags="${XCB_CFLAGS}" - evas_engine_[]$1[]_libs="${XCB_LIBS}" - ],[ - have_dep="no" - ] -) + ], + [have_dep="no"]) + +evas_engine_[]$1[]_cflags="${XCB_CFLAGS}" +evas_engine_[]$1[]_libs="${XCB_LIBS}" + +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_pc_evas="${requirement} ${requirements_pc_evas}" + requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" +fi AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) -if test "x$3" = "xstatic" ; then - requirement_evas="${requirement} ${requirement_evas}" -fi - if test "x${have_dep}" = "xyes" ; then m4_default([$4], [:]) else @@ -236,6 +246,8 @@ dnl use: EVAS_CHECK_ENGINE_DEP_GL_XCB(engine, simple, want_static[, ACTION-IF-FO AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB], [ +requirement="" +have_dep="no" evas_engine_[]$1[]_cflags="" evas_engine_[]$1[]_libs="" @@ -293,19 +305,18 @@ PKG_CHECK_MODULES([XCB_GL], [ have_dep="yes" requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil" - evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}" - evas_engine_[]$1[]_libs="${XCB_GL_LIBS}" - ],[ - have_dep="no" - ] -) + ], + [have_dep="no"]) + +evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}" +evas_engine_[]$1[]_libs="${XCB_GL_LIBS}" if test "x$gl_flavor_gles" = "xyes" ; then have_dep=no fi if test "x${have_dep}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then if test "x$2" = "xyes" ; then x_libs="${x_libs} -lX11 -lXext -lXrender" @@ -337,7 +348,7 @@ else if test "x${have_egl}" = "xyes" ; then AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) if test "x${have_glesv2}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" @@ -350,6 +361,13 @@ else fi fi +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" + requirements_pc_evas="${requirement} ${requirements_pc_evas}" + requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" +fi + AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) @@ -375,8 +393,12 @@ AC_CHECK_HEADER([windows.h], [ have_dep="yes" evas_engine_[]$1[]_libs="-lgdi32" - ] -) + ]) + +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) @@ -402,8 +424,12 @@ AC_CHECK_HEADER([ddraw.h], [ have_dep="yes" evas_engine_[]$1[]_libs="-lddraw" - ] -) + ]) + +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) @@ -429,8 +455,12 @@ AC_CHECK_HEADERS([d3d9.h d3dx9.h], have_dep="yes" evas_engine_[]$1[]_libs="-ld3d9 -ld3dx9 -lgdi32" ], - [have_dep="no"; break] -) + [have_dep="no"; break]) + +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) @@ -481,7 +511,12 @@ LIBS="$LIBS_save" AC_LANG_POP([Objective C]) if test "x${have_dep}" = "xyes" ; then - PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) + PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) +fi + +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" fi AC_SUBST([evas_engine_$1_cflags]) @@ -510,10 +545,10 @@ PKG_CHECK_MODULES([SDL], [ have_dep="yes" requirement="sdl" - evas_engine_[]$1[]_cflags="${SDL_CFLAGS}" - evas_engine_[]$1[]_libs="${SDL_LIBS}" - ] -) + ]) + +evas_engine_[]$1[]_cflags="${SDL_CFLAGS}" +evas_engine_[]$1[]_libs="${SDL_LIBS}" gl_pt_lib=""; have_gl_pt="no" @@ -577,6 +612,13 @@ else fi fi +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" + requirements_pc_evas="${requirement} ${requirements_pc_evas}" + requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" +fi + AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) @@ -631,52 +673,16 @@ PKG_CHECK_MODULES([DIRECTFB], requirement="directfb" evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}" evas_engine_[]$1[]_libs="${DIRECTFB_LIBS}" - ] -) + ]) + +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_pc_evas="${requirement} ${requirements_pc_evas}" + requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" +fi AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) -if test "x$3" = "xstatic" ; then - requirement_evas="${requirement} ${requirement_evas}" -fi - -if test "x${have_dep}" = "xyes" ; then - m4_default([$4], [:]) -else - m4_default([$5], [:]) -fi - -]) - -dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_8_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) - -AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_8_X11], -[ - -have_dep="no" -evas_engine_[]$1[]_cflags="" -evas_engine_[]$1[]_libs="" - -PKG_CHECK_MODULES([XCB], - [xcb xcb-shm xcb-image >= 0.2.1 pixman-1], - [ - have_dep="yes" - requirement="xcb xcb-shm xcb-image pixman-1" - evas_engine_[]$1[]_cflags="${XCB_CFLAGS}" - evas_engine_[]$1[]_libs="${XCB_LIBS}" - ],[ - have_dep="no" - ] -) - -AC_SUBST([evas_engine_$1_cflags]) -AC_SUBST([evas_engine_$1_libs]) - -if test "x$3" = "xstatic" ; then - requirement_evas="${requirement} ${requirement_evas}" -fi - if test "x${have_dep}" = "xyes" ; then m4_default([$4], [:]) else @@ -745,27 +751,27 @@ else gl_library="gl" fi -PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) +PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) PKG_CHECK_MODULES([WAYLAND_EGL], [egl >= 7.10 ${gl_library} wayland-client wayland-egl], [ have_dep="yes" - requirement="egl >= 7.10 ${gl_library} wayland-client wayland-egl" - evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" - evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}" - ],[ - have_dep="no" - ] -) + requirement="egl ${gl_library} wayland-client wayland-egl" + ], + [have_dep="no"]) + +evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" +evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}" + +if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_pc_evas="${requirement} ${requirements_pc_evas}" + requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" +fi AC_SUBST([evas_engine_$1_cflags]) AC_SUBST([evas_engine_$1_libs]) -if test "x$3" = "xstatic" ; then - requirement_evas="${requirement} ${requirement_evas}" -fi - if test "x${have_dep}" = "xyes" ; then m4_default([$4], [:]) else diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4 new file mode 100644 index 0000000000..1b0831dcea --- /dev/null +++ b/m4/evas_check_loader.m4 @@ -0,0 +1,534 @@ + +dnl use: EVAS_CHECK_LOADER_DEP_BMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_BMP], +[ + +have_dep="yes" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_EET(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_EET], +[ + +requirement="" +have_dep="no" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +PKG_CHECK_MODULES([EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes" requirement="eet >= ${PACKAGE_VERSION}"], [have_dep="no"]) +evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}" +evas_image_loader_[]$1[]_libs="${EET_LIBS}" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_pc_evas="${requirement} ${requirements_pc_evas}" + requirements_pc_deps_evas="${requirements_pc_deps_evas}" +fi + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_GENERIC(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_GENERIC], +[ + +have_dep="yes" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_GIF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_GIF], +[ + +have_dep="no" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_CHECK_HEADER([gif_lib.h], [have_dep="yes"]) + +if test "x${have_dep}" = "xyes" ; then + AC_CHECK_LIB([gif], + [DGifOpenFileName], + [ + evas_image_loader_[]$1[]_libs="-lgif" + ], + [have_dep="no"] + ) + + if test "x${have_dep}" = "xno" ; then + AC_CHECK_LIB([ungif], + [DGifOpenFileName], + [ + have_dep="yes" + evas_image_loader_[]$1[]_libs="-lungif" + ] + ) + fi +fi + +if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_ICO(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_ICO], +[ + +have_dep="yes" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_JPEG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_JPEG], +[ + +have_dep="no" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_CHECK_HEADER([jpeglib.h], [have_dep="yes"]) + +if test "x${have_dep}" = "xyes" ; then + AC_CHECK_LIB([jpeg], + [jpeg_CreateDecompress], + [ + evas_image_loader_[]$1[]_libs="-ljpeg" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include +#include + ]], + [[ +struct jpeg_decompress_struct decomp; +decomp.region_x = 0; + ]])], + [have_jpeg_region="yes"], + [have_jpeg_region="no"]) + ], + [have_dep="no"] + ) + if test "x${have_jpeg_region}" = "xyes" ; then + AC_DEFINE(BUILD_LOADER_JPEG_REGION, [1], [JPEG Region Decode Support]) + fi +fi + +if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_PMAPS(loader, want_static[[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_PMAPS], +[ + +have_dep="yes" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_PNG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG], +[ + +requirement="" +have_dep="no" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +dnl libpng.pc is the latest version of libpng that ahs been installed. +dnl We check it first. +PKG_CHECK_MODULES([PNG], + [libpng >= 1.2.10], + [have_dep="yes" requirement="libpng"], + [have_dep="no"]) + +if test "x${have_dep}" = "xno" ; then + PKG_CHECK_MODULES([PNG], + [libpng15], + [have_dep="yes" requirement="libpng15"], + [have_dep="no"]) +fi + +if test "x${have_dep}" = "xno" ; then + PKG_CHECK_MODULES([PNG], + [libpng14], + [have_dep="yes" requirement="libpng14"], + [have_dep="no"]) +fi + +if test "x${have_dep}" = "xno" ; then + PKG_CHECK_MODULES([PNG], + [libpng12 >= 1.2.10], + [have_dep="yes" requirement="libpng12"], + [have_dep="no"]) +fi + +evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}" +evas_image_loader_[]$1[]_libs="${PNG_LIBS}" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_pc_evas="${requirement} ${requirements_pc_evas}" + requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" +fi + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_PSD(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_PSD], +[ + +have_dep="yes" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_SVG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG], +[ + +requirement="" +have_esvg="no" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" +version_esvg="0.0.18" +version_ender="0.0.6" + +PKG_CHECK_MODULES([SVG], + [esvg >= ${version_esvg} ender >= ${version_ender}], + [have_dep="yes" have_esvg="yes" requirement="esvg >= ${version_esvg} ender >= ${version_ender}"], + [have_dep="no"]) + +if test "x${have_dep}" = "xyes" ; then + evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}" + evas_image_loader_[]$1[]_libs="${SVG_LIBS}" +fi + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_pc_evas="${requirement} ${requirements_pc_evas}" + requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" +fi + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_TGA(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_TGA], +[ + +have_dep="yes" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_TIFF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_TIFF], +[ + +have_dep="no" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_CHECK_HEADER([tiffio.h], [have_dep="yes"]) + +if test "x${have_dep}" = "xyes" ; then + AC_CHECK_LIB([tiff], + [TIFFReadScanline], + [ + evas_image_loader_[]$1[]_libs="-ltiff" + ], + [have_dep="no"] + ) + + if test "x${have_dep}" = "xno" ; then + AC_CHECK_LIB([tiff], + [TIFFReadScanline], + [ + have_dep="yes" + evas_image_loader_[]$1[]_libs="-ltiff -ljpeg -lz -lm" + ] + ) + fi + + if test "x${have_dep}" = "xno" ; then + AC_CHECK_LIB([tiff34], + [TIFFReadScanline], + [ + have_dep="yes" + evas_image_loader_[]$1[]_libs="-ltiff34 -ljpeg -lz -lm" + ] + ) + fi +fi + +if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_WBMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_WBMP], +[ + +have_dep="yes" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_WEBP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_WEBP], +[ + +have_dep="no" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_CHECK_HEADER([webp/decode.h], [have_dep="yes"]) + +if test "x${have_dep}" = "xyes" ; then + AC_CHECK_LIB([webp], + [WebPDecodeRGBA], + [ + evas_image_loader_[]$1[]_libs="-lwebp" + ], + [have_dep="no"] + ) +fi + +if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then + requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" + requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}" +fi + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_LOADER_DEP_XPM(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_LOADER_DEP_XPM], +[ + +have_dep="yes" +evas_image_loader_[]$1[]_cflags="" +evas_image_loader_[]$1[]_libs="" + +AC_SUBST([evas_image_loader_$1_cflags]) +AC_SUBST([evas_image_loader_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_IMAGE_LOADER(loader, want_loader, macro) + + +AC_DEFUN([EVAS_CHECK_IMAGE_LOADER], +[ + +m4_pushdef([UP], m4_toupper([$1])) +m4_pushdef([DOWN], m4_tolower([$1])) + +want_loader="$2" +want_static_loader="no" +have_loader="no" +have_evas_image_loader_[]DOWN="no" + +AC_MSG_CHECKING([whether to enable $1 image loader]) +AC_MSG_RESULT([${want_loader}]) + +if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic" -o "x${want_loader}" = "xauto"; then + m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, ${want_loader}, [have_loader="yes"], [have_loader="no"]) +fi + +if test "x${have_loader}" = "xno" -a "x${want_loader}" = "xyes" -a "x${use_strict}" = "xyes" ; then + AC_MSG_ERROR([$1 dependencies not found (strict dependencies checking)]) +fi + +AC_MSG_CHECKING([whether $1 image loader will be built]) +AC_MSG_RESULT([${have_loader}]) + +if test "x${have_loader}" = "xyes" ; then + if test "x${want_loader}" = "xstatic" ; then + have_evas_image_loader_[]DOWN="static" + want_static_loader="yes" + else + have_evas_image_loader_[]DOWN="yes" + fi +fi + +if test "x${have_loader}" = "xyes" ; then + AC_DEFINE(BUILD_LOADER_[]UP, [1], [UP Image Loader Support]) +fi + +AM_CONDITIONAL(BUILD_LOADER_[]UP, [test "x${have_loader}" = "xyes"]) + +if test "x${want_static_loader}" = "xyes" ; then + AC_DEFINE(EVAS_STATIC_BUILD_[]UP, [1], [Build $1 image loader inside libevas]) + have_static_module="yes" +fi + +AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_loader}" = "xyes"]) + +m4_popdef([UP]) +m4_popdef([DOWN]) + +]) diff --git a/legacy/evas/m4/evas_dither.m4 b/m4/evas_dither.m4 similarity index 100% rename from legacy/evas/m4/evas_dither.m4 rename to m4/evas_dither.m4 diff --git a/legacy/evas/ChangeLog b/old/ChangeLog.evas similarity index 100% rename from legacy/evas/ChangeLog rename to old/ChangeLog.evas diff --git a/legacy/evas/NEWS b/old/NEWS.evas similarity index 100% rename from legacy/evas/NEWS rename to old/NEWS.evas diff --git a/legacy/evas/README b/old/README.evas similarity index 100% rename from legacy/evas/README rename to old/README.evas diff --git a/legacy/evas/evas-direct3d.pc.in b/pc/evas-direct3d.pc.in similarity index 100% rename from legacy/evas/evas-direct3d.pc.in rename to pc/evas-direct3d.pc.in diff --git a/legacy/evas/evas-directfb.pc.in b/pc/evas-directfb.pc.in similarity index 100% rename from legacy/evas/evas-directfb.pc.in rename to pc/evas-directfb.pc.in diff --git a/legacy/evas/evas-fb.pc.in b/pc/evas-fb.pc.in similarity index 100% rename from legacy/evas/evas-fb.pc.in rename to pc/evas-fb.pc.in diff --git a/legacy/evas/evas-opengl-cocoa.pc.in b/pc/evas-opengl-cocoa.pc.in similarity index 100% rename from legacy/evas/evas-opengl-cocoa.pc.in rename to pc/evas-opengl-cocoa.pc.in diff --git a/legacy/evas/evas-opengl-sdl.pc.in b/pc/evas-opengl-sdl.pc.in similarity index 100% rename from legacy/evas/evas-opengl-sdl.pc.in rename to pc/evas-opengl-sdl.pc.in diff --git a/legacy/evas/evas-opengl-x11.pc.in b/pc/evas-opengl-x11.pc.in similarity index 100% rename from legacy/evas/evas-opengl-x11.pc.in rename to pc/evas-opengl-x11.pc.in diff --git a/legacy/evas/evas-psl1ght.pc.in b/pc/evas-psl1ght.pc.in similarity index 100% rename from legacy/evas/evas-psl1ght.pc.in rename to pc/evas-psl1ght.pc.in diff --git a/legacy/evas/evas-software-buffer.pc.in b/pc/evas-software-buffer.pc.in similarity index 100% rename from legacy/evas/evas-software-buffer.pc.in rename to pc/evas-software-buffer.pc.in diff --git a/legacy/evas/evas-software-ddraw.pc.in b/pc/evas-software-ddraw.pc.in similarity index 100% rename from legacy/evas/evas-software-ddraw.pc.in rename to pc/evas-software-ddraw.pc.in diff --git a/legacy/evas/evas-software-gdi.pc.in b/pc/evas-software-gdi.pc.in similarity index 100% rename from legacy/evas/evas-software-gdi.pc.in rename to pc/evas-software-gdi.pc.in diff --git a/legacy/evas/evas-software-sdl.pc.in b/pc/evas-software-sdl.pc.in similarity index 100% rename from legacy/evas/evas-software-sdl.pc.in rename to pc/evas-software-sdl.pc.in diff --git a/legacy/evas/evas-software-x11.pc.in b/pc/evas-software-x11.pc.in similarity index 100% rename from legacy/evas/evas-software-x11.pc.in rename to pc/evas-software-x11.pc.in diff --git a/legacy/evas/evas-wayland-egl.pc.in b/pc/evas-wayland-egl.pc.in similarity index 100% rename from legacy/evas/evas-wayland-egl.pc.in rename to pc/evas-wayland-egl.pc.in diff --git a/legacy/evas/evas-wayland-shm.pc.in b/pc/evas-wayland-shm.pc.in similarity index 100% rename from legacy/evas/evas-wayland-shm.pc.in rename to pc/evas-wayland-shm.pc.in diff --git a/legacy/evas/evas.pc.in b/pc/evas.pc.in similarity index 53% rename from legacy/evas/evas.pc.in rename to pc/evas.pc.in index f5c514a861..6c852b5ccc 100644 --- a/legacy/evas/evas.pc.in +++ b/pc/evas.pc.in @@ -5,8 +5,8 @@ includedir=@includedir@ Name: evas Description: Evas canvas display library -@pkgconfig_requires_private@: @requirement_evas@ +Requires.private: @requirements_pc_evas@ Version: @VERSION@ -Libs: -L${libdir} -levas @EINA_LIBS@ @shm_open_libs@ -Libs.private: @EFL_FNMATCH_LIBS@ @pthread_libs@ @shm_open_libs@ +Libs: -L${libdir} -levas +Libs.private: @requirements_libs_evas@ Cflags: -I${includedir}/evas-@VMAJ@ diff --git a/src/Makefile.am b/src/Makefile.am index b0fc8b5da8..930d4aebed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = . scripts benchmarks tests examples +SUBDIRS = . benchmarks tests examples lib_LTLIBRARIES = bin_PROGRAMS = @@ -15,6 +15,7 @@ endif include Makefile_Eina.am include Makefile_Eo.am include Makefile_Eet.am +include Makefile_Evas.am include Makefile_Embryo.am .PHONY: benchmark examples diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am index 930f62f973..4f5de8420f 100644 --- a/src/Makefile_Eina.am +++ b/src/Makefile_Eina.am @@ -239,3 +239,7 @@ EXTRA_DIST += \ lib/eina/eina_config.h.in \ lib/eina/eina_strbuf_template_c.x \ lib/eina/eina_binbuf_template_c.x + +### Script + +bin_SCRIPTS = scripts/eina/eina-bench-cmp diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am new file mode 100644 index 0000000000..49b8cd7ca7 --- /dev/null +++ b/src/Makefile_Evas.am @@ -0,0 +1,1837 @@ + +### Library + +lib_LTLIBRARIES += lib/evas/libevas.la + +installed_evasmainheadersdir = $(includedir)/evas-@VMAJ@ +dist_installed_evasmainheaders_DATA = lib/evas/Evas.h lib/evas/Evas_GL.h + +noinst_HEADERS = \ +lib/evas/include/evas_inline.x \ +lib/evas/include/evas_private.h \ +lib/evas/include/evas_options.h \ +lib/evas/include/evas_macros.h \ +lib/evas/include/evas_mmx.h \ +lib/evas/include/evas_common.h \ +lib/evas/include/evas_blend_ops.h + +# Linebreak + +noinst_HEADERS += \ +static_libs/liblinebreak/linebreak.h \ +static_libs/liblinebreak/linebreakdef.h \ +static_libs/liblinebreak/wordbreakdef.h \ +static_libs/liblinebreak/wordbreak.h + +# Linebreak +lib_evas_libevas_la_SOURCES = \ +static_libs/liblinebreak/linebreak.c \ +static_libs/liblinebreak/linebreakdata.c \ +static_libs/liblinebreak/linebreakdef.c \ +static_libs/liblinebreak/wordbreak.c \ +static_libs/liblinebreak/wordbreakdata.x + +# Main +lib_evas_libevas_la_SOURCES += \ +lib/evas/main.c + +# Canvas +lib_evas_libevas_la_SOURCES += \ +lib/evas/canvas/common_interfaces.c \ +lib/evas/canvas/evas_callbacks.c \ +lib/evas/canvas/evas_clip.c \ +lib/evas/canvas/evas_common_interface.c \ +lib/evas/canvas/evas_data.c \ +lib/evas/canvas/evas_device.c \ +lib/evas/canvas/evas_events.c \ +lib/evas/canvas/evas_filter.c \ +lib/evas/canvas/evas_focus.c \ +lib/evas/canvas/evas_key.c \ +lib/evas/canvas/evas_key_grab.c \ +lib/evas/canvas/evas_layer.c \ +lib/evas/canvas/evas_main.c \ +lib/evas/canvas/evas_name.c \ +lib/evas/canvas/evas_object_image.c \ +lib/evas/canvas/evas_object_main.c \ +lib/evas/canvas/evas_object_inform.c \ +lib/evas/canvas/evas_object_intercept.c \ +lib/evas/canvas/evas_object_line.c \ +lib/evas/canvas/evas_object_polygon.c \ +lib/evas/canvas/evas_object_rectangle.c \ +lib/evas/canvas/evas_object_smart.c \ +lib/evas/canvas/evas_object_smart_clipped.c \ +lib/evas/canvas/evas_object_box.c \ +lib/evas/canvas/evas_object_table.c \ +lib/evas/canvas/evas_object_text.c \ +lib/evas/canvas/evas_object_textblock.c \ +lib/evas/canvas/evas_object_textgrid.c \ +lib/evas/canvas/evas_object_grid.c \ +lib/evas/canvas/evas_font_dir.c \ +lib/evas/canvas/evas_rectangle.c \ +lib/evas/canvas/evas_render.c \ +lib/evas/canvas/evas_smart.c \ +lib/evas/canvas/evas_stack.c \ +lib/evas/canvas/evas_async_events.c \ +lib/evas/canvas/evas_stats.c \ +lib/evas/canvas/evas_touch_point.c \ +lib/evas/canvas/evas_map.c \ +lib/evas/canvas/evas_gl.c + +# Cache +lib_evas_libevas_la_SOURCES += \ +lib/evas/cache/evas_cache_image.c \ +lib/evas/cache/evas_cache_engine_image.c \ +lib/evas/cache/evas_preload.c \ +lib/evas/cache/evas_cache.h + +# Cache2 - Cserve2 +if EVAS_CSERVE2 +lib_evas_libevas_la_SOURCES += \ +lib/evas/cache2/evas_cache2.c \ +lib/evas/cache2/evas_cache2.h + +lib_evas_libevas_la_SOURCES += \ +lib/evas/cserve2/evas_cs2.h \ +lib/evas/cserve2/evas_cs2_private.h \ +lib/evas/cserve2/evas_cs2_image_data.c \ +lib/evas/cserve2/evas_cs2_client.c + +lib_evas_libevas_la_SOURCES += \ +lib/evas/cserve2/evas_cs2_utils.h \ +lib/evas/cserve2/evas_cs2_utils.c +endif + +# File +lib_evas_libevas_la_SOURCES += \ +lib/evas/file/evas_path.c \ +lib/evas/file/evas_module.c \ +lib/evas/file/evas_module.h \ +lib/evas/file/evas_path.h + +# Engine +lib_evas_libevas_la_SOURCES += \ +lib/evas/common/evas_op_copy_main_.c \ +lib/evas/common/evas_op_blend_main_.c \ +lib/evas/common/evas_op_add_main_.c \ +lib/evas/common/evas_op_sub_main_.c \ +lib/evas/common/evas_op_mask_main_.c \ +lib/evas/common/evas_op_mul_main_.c \ +lib/evas/common/evas_blend_main.c \ +lib/evas/common/evas_blit_main.c \ +lib/evas/common/evas_convert_color.c \ +lib/evas/common/evas_convert_colorspace.c \ +lib/evas/common/evas_convert_gry_1.c \ +lib/evas/common/evas_convert_gry_8.c \ +lib/evas/common/evas_convert_main.c \ +lib/evas/common/evas_convert_rgb_16.c \ +lib/evas/common/evas_convert_rgb_24.c \ +lib/evas/common/evas_convert_rgb_32.c \ +lib/evas/common/evas_convert_rgb_8.c \ +lib/evas/common/evas_convert_grypal_6.c \ +lib/evas/common/evas_convert_yuv.c \ +lib/evas/common/evas_cpu.c \ +lib/evas/common/evas_draw_main.c \ +lib/evas/common/evas_font_draw.c \ +lib/evas/common/evas_font_load.c \ +lib/evas/common/evas_font_main.c \ +lib/evas/common/evas_font_query.c \ +lib/evas/common/evas_image_load.c \ +lib/evas/common/evas_image_save.c \ +lib/evas/common/evas_image_main.c \ +lib/evas/common/evas_image_data.c \ +lib/evas/common/evas_image_scalecache.c \ +lib/evas/common/evas_line_main.c \ +lib/evas/common/evas_polygon_main.c \ +lib/evas/common/evas_rectangle_main.c \ +lib/evas/common/evas_scale_main.c \ +lib/evas/common/evas_scale_sample.c \ +lib/evas/common/evas_scale_smooth.c \ +lib/evas/common/evas_scale_span.c \ +lib/evas/common/evas_tiler.c \ +lib/evas/common/evas_regionbuf.c \ +lib/evas/common/evas_pipe.c \ +lib/evas/common/language/evas_bidi_utils.c \ +lib/evas/common/language/evas_language_utils.c \ +lib/evas/common/evas_text_utils.c \ +lib/evas/common/evas_font_ot.c \ +lib/evas/common/evas_map_image.c \ +lib/evas/common/evas_map_image.h \ +lib/evas/common/evas_blend.h \ +lib/evas/common/evas_blend_private.h \ +lib/evas/common/evas_convert_color.h \ +lib/evas/common/evas_convert_colorspace.h \ +lib/evas/common/evas_convert_gry_1.h \ +lib/evas/common/evas_convert_gry_8.h \ +lib/evas/common/evas_convert_grypal_6.h \ +lib/evas/common/evas_convert_main.h \ +lib/evas/common/evas_convert_rgb_16.h \ +lib/evas/common/evas_convert_rgb_24.h \ +lib/evas/common/evas_convert_rgb_32.h \ +lib/evas/common/evas_convert_rgb_8.h \ +lib/evas/common/evas_convert_yuv.h \ +lib/evas/common/evas_draw.h \ +lib/evas/common/evas_font.h \ +lib/evas/common/evas_font_default_walk.x \ +lib/evas/common/evas_font_private.h \ +lib/evas/common/evas_image.h \ +lib/evas/common/evas_image_private.h \ +lib/evas/common/evas_line.h \ +lib/evas/common/evas_polygon.h \ +lib/evas/common/evas_rectangle.h \ +lib/evas/common/evas_scale_main.h \ +lib/evas/common/evas_scale_smooth.h \ +lib/evas/common/evas_scale_span.h \ +lib/evas/common/evas_pipe.h \ +lib/evas/common/language/evas_bidi_utils.h \ +lib/evas/common/language/evas_language_utils.h \ +lib/evas/common/language/evas_script_table.h \ +lib/evas/common/evas_text_utils.h \ +lib/evas/common/evas_font_ot.h + +# SSE3 +lib_evas_libevas_la_SOURCES += \ +lib/evas/common/evas_op_blend/op_blend_master_sse3.c + +lib_evas_libevas_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/lib/evas/file \ +-I$(top_builddir)/src/lib/evas/file \ +-I$(top_srcdir)/src/static_libs/liblinebreak \ +-I$(top_builddir)/src/static_libs/liblinebreak \ +-I$(top_srcdir)/src/lib/evas/common \ +-I$(top_builddir)/src/lib/evas/common \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/eet \ +-I$(top_builddir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eet \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ \ +@VALGRIND_CFLAGS@ \ +@EVAS_ALTIVEC_CFLAGS@ \ +@EVAS_SSE3_CFLAGS@ + +if HAVE_WINDOWS +lib_evas_libevas_la_CPPFLAGS += \ +-I$(top_srcdir)/src/lib/evil \ +-I$(top_builddir)/src/lib/evil +endif + +lib_evas_libevas_la_CXXFLAGS = + +lib_evas_libevas_la_LIBADD = \ +lib/eina/libeina.la \ +lib/eet/libeet.la \ +lib/eo/libeo.la \ +@EVAS_LIBS@ \ +-lm + +lib_evas_libevas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ + +# Linebreak + +EXTRA_DIST += \ +static_libs/liblinebreak/LineBreak1.sed \ +static_libs/liblinebreak/LineBreak2.sed \ +static_libs/liblinebreak/linebreakdata1.tmpl \ +static_libs/liblinebreak/linebreakdata2.tmpl \ +static_libs/liblinebreak/linebreakdata3.tmpl \ +static_libs/liblinebreak/LICENCE + +# Engines + +EXTRA_DIST += \ +lib/evas/common/evas_map_image_internal.c \ +lib/evas/common/evas_map_image_core.c \ +lib/evas/common/evas_map_image_loop.c \ +lib/evas/common/evas_scale_smooth_scaler.c \ +lib/evas/common/evas_scale_smooth_scaler_down.c \ +lib/evas/common/evas_scale_smooth_scaler_downx.c \ +lib/evas/common/evas_scale_smooth_scaler_downx_downy.c \ +lib/evas/common/evas_scale_smooth_scaler_downy.c \ +lib/evas/common/evas_scale_smooth_scaler_noscale.c \ +lib/evas/common/evas_scale_smooth_scaler_up.c + +# evas_op_add + +EXTRA_DIST += \ +lib/evas/common/evas_op_add/op_add_color_.c \ +lib/evas/common/evas_op_add/op_add_color_i386.c \ +lib/evas/common/evas_op_add/op_add_mask_color_.c \ +lib/evas/common/evas_op_add/op_add_mask_color_i386.c \ +lib/evas/common/evas_op_add/op_add_pixel_.c \ +lib/evas/common/evas_op_add/op_add_pixel_color_.c \ +lib/evas/common/evas_op_add/op_add_pixel_color_i386.c \ +lib/evas/common/evas_op_add/op_add_pixel_i386.c \ +lib/evas/common/evas_op_add/op_add_pixel_mask_.c \ +lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c + +# evas_op_blend + +EXTRA_DIST += \ +lib/evas/common/evas_op_blend/op_blend_color_.c \ +lib/evas/common/evas_op_blend/op_blend_color_i386.c \ +lib/evas/common/evas_op_blend/op_blend_color_neon.c \ +lib/evas/common/evas_op_blend/op_blend_color_sse3.c \ +lib/evas/common/evas_op_blend/op_blend_mask_color_.c \ +lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c \ +lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c \ +lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_color_.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_i386.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_neon.c \ +lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c + +# evas_op_copy + +EXTRA_DIST += \ +lib/evas/common/evas_op_copy/op_copy_color_.c \ +lib/evas/common/evas_op_copy/op_copy_color_i386.c \ +lib/evas/common/evas_op_copy/op_copy_color_neon.c \ +lib/evas/common/evas_op_copy/op_copy_mask_color_.c \ +lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c \ +lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_neon.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_color_.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_i386.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c \ +lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c + +# evas_op_mask + +EXTRA_DIST += \ +lib/evas/common/evas_op_mask/op_mask_color_.c \ +lib/evas/common/evas_op_mask/op_mask_color_i386.c \ +lib/evas/common/evas_op_mask/op_mask_mask_color_.c \ +lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c \ +lib/evas/common/evas_op_mask/op_mask_pixel_.c \ +lib/evas/common/evas_op_mask/op_mask_pixel_color_.c \ +lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c \ +lib/evas/common/evas_op_mask/op_mask_pixel_i386.c \ +lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c \ +lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c + +# evas_op_mul + +EXTRA_DIST += \ +lib/evas/common/evas_op_mul/op_mul_color_.c \ +lib/evas/common/evas_op_mul/op_mul_color_i386.c \ +lib/evas/common/evas_op_mul/op_mul_mask_color_.c \ +lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c \ +lib/evas/common/evas_op_mul/op_mul_pixel_.c \ +lib/evas/common/evas_op_mul/op_mul_pixel_color_.c \ +lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c \ +lib/evas/common/evas_op_mul/op_mul_pixel_i386.c \ +lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c \ +lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c + +# evas_op_sub + +EXTRA_DIST += \ +lib/evas/common/evas_op_sub/op_sub_color_.c \ +lib/evas/common/evas_op_sub/op_sub_color_i386.c \ +lib/evas/common/evas_op_sub/op_sub_mask_color_.c \ +lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c \ +lib/evas/common/evas_op_sub/op_sub_pixel_.c \ +lib/evas/common/evas_op_sub/op_sub_pixel_color_.c \ +lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c \ +lib/evas/common/evas_op_sub/op_sub_pixel_i386.c \ +lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c \ +lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c + + +### Engines + +if EVAS_STATIC_BUILD_SOFTWARE_GENERIC +lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c +lib_evas_libevas_la_LIBADD += +else +enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) +enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la +modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c +modules_evas_engines_software_generic_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la +modules_evas_engines_software_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_ENGINE_BUFFER +dist_installed_evasmainheaders_DATA += modules/evas/engines/buffer/Evas_Engine_Buffer.h +BUFFER_SOURCES = \ +modules/evas/engines/buffer/evas_engine.c \ +modules/evas/engines/buffer/evas_outbuf.c \ +modules/evas/engines/buffer/evas_engine.h +if EVAS_STATIC_BUILD_BUFFER +lib_evas_libevas_la_SOURCES += $(BUFFER_SOURCES) +else +enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH) +enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la +modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES) +modules_evas_engines_buffer_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ +modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_DIRECT3D +dist_installed_evasmainheaders_DATA += modules/evas/engines/direct3d/Evas_Engine_Direct3D.h +DIRECT3D_SOURCES = \ +modules/evas/engines/direct3d/evas_engine.c \ +modules/evas/engines/direct3d/evas_direct3d_context.cpp \ +modules/evas/engines/direct3d/evas_direct3d_device.cpp \ +modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp \ +modules/evas/engines/direct3d/evas_direct3d_main.cpp \ +modules/evas/engines/direct3d/evas_direct3d_object.cpp \ +modules/evas/engines/direct3d/evas_direct3d_object_font.cpp \ +modules/evas/engines/direct3d/evas_direct3d_object_image.cpp \ +modules/evas/engines/direct3d/evas_direct3d_object_line.cpp \ +modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp \ +modules/evas/engines/direct3d/evas_direct3d_scene.cpp \ +modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp \ +modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp \ +modules/evas/engines/direct3d/array.h \ +modules/evas/engines/direct3d/evas_direct3d_context.h \ +modules/evas/engines/direct3d/evas_direct3d_device.h \ +modules/evas/engines/direct3d/evas_direct3d_image_cache.h \ +modules/evas/engines/direct3d/evas_direct3d_object.h \ +modules/evas/engines/direct3d/evas_direct3d_object_font.h \ +modules/evas/engines/direct3d/evas_direct3d_object_image.h \ +modules/evas/engines/direct3d/evas_direct3d_object_line.h \ +modules/evas/engines/direct3d/evas_direct3d_object_rect.h \ +modules/evas/engines/direct3d/evas_direct3d_scene.h \ +modules/evas/engines/direct3d/evas_direct3d_shader_pack.h \ +modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.h \ +modules/evas/engines/direct3d/evas_engine.h \ +modules/evas/engines/direct3d/ref.h +if EVAS_STATIC_BUILD_DIRECT3D +lib_evas_libevas_la_SOURCES += $(DIRECT3D_SOURCES) +lib_evas_libevas_la_CPPFLAGS += @evas_engine_direct3d_cflags@ +lib_evas_libevas_la_CXXFLAGS += -fno-rtti -fno-exceptions +lib_evas_libevas_la_LIBADD += @evas_engine_direct3d_libs@ +else +enginedirect3dpkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH) +enginedirect3dpkg_LTLIBRARIES = modules/evas/engines/direct3d/module.la +modules_evas_engines_direct3d_module_la_SOURCES = $(DIRECT3D_SOURCES) +modules_evas_engines_direct3d_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@evas_engine_direct3d_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_direct3d_module_la_CXXFLAGS = -fno-rtti -fno-exceptions +modules_evas_engines_direct3d_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_engine_direct3d_libs@ +modules_evas_engines_direct3d_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_direct3d_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_DIRECTFB +dist_installed_evasmainheaders_DATA += modules/evas/engines/directfb/Evas_Engine_DirectFB.h +DIRECTFB_SOURCES = \ +modules/evas/engines/directfb/evas_engine.c \ +modules/evas/engines/directfb/polygon.c \ +modules/evas/engines/directfb/evas_engine.h +if EVAS_STATIC_BUILD_DIRECTFB +lib_evas_libevas_la_SOURCES += $(DIRECTFB_SOURCES) +lib_evas_libevas_la_CPPFLAGS += @evas_engine_directfb_cflags@ +lib_evas_libevas_la_LIBADD += @evas_engine_directfb_libs@ +else +enginedirectfbpkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH) +enginedirectfbpkg_LTLIBRARIES = modules/evas/engines/directfb/module.la +modules_evas_engines_directfb_module_la_SOURCES = $(DIRECTFB_SOURCES) +modules_evas_engines_directfb_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@evas_engine_directfb_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_directfb_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_engine_directfb_libs@ +modules_evas_engines_directfb_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_directfb_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_FB +dist_installed_evasmainheaders_DATA += modules/evas/engines/fb/Evas_Engine_FB.h +FB_SOURCES = \ +modules/evas/engines/fb/evas_engine.c \ +modules/evas/engines/fb/evas_fb_main.c \ +modules/evas/engines/fb/evas_outbuf.c \ +modules/evas/engines/fb/evas_engine.h \ +modules/evas/engines/fb/evas_fb.h +if EVAS_STATIC_BUILD_FB +lib_evas_libevas_la_SOURCES += $(FB_SOURCES) +lib_evas_libevas_la_CPPFLAGS += @evas_engine_fb_cflags@ +lib_evas_libevas_la_LIBADD += @evas_engine_fb_libs@ +else +enginefbpkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH) +enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la +modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES) +modules_evas_engines_fb_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@evas_engine_fb_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_fb_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_engine_fb_libs@ +modules_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_GL_COMMON +GL_COMMON_SOURCES = \ +modules/evas/engines/gl_common/evas_gl_private.h \ +modules/evas/engines/gl_common/evas_gl_common.h \ +modules/evas/engines/gl_common/evas_gl_context.c \ +modules/evas/engines/gl_common/evas_gl_shader.c \ +modules/evas/engines/gl_common/evas_gl_rectangle.c \ +modules/evas/engines/gl_common/evas_gl_texture.c \ +modules/evas/engines/gl_common/evas_gl_image.c \ +modules/evas/engines/gl_common/evas_gl_font.c \ +modules/evas/engines/gl_common/evas_gl_polygon.c \ +modules/evas/engines/gl_common/evas_gl_line.c \ +modules/evas/engines/gl_common/evas_gl_filter.c \ +modules/evas/engines/gl_common/evas_gl_core.c \ +modules/evas/engines/gl_common/evas_gl_api_ext.h \ +modules/evas/engines/gl_common/evas_gl_api_ext_def.h \ +modules/evas/engines/gl_common/evas_gl_core.h \ +modules/evas/engines/gl_common/evas_gl_core_private.h \ +modules/evas/engines/gl_common/evas_gl_api.c \ +modules/evas/engines/gl_common/evas_gl_api_ext.c \ +modules/evas/engines/gl_common/shader/rect_frag.h \ +modules/evas/engines/gl_common/shader/rect_vert.h \ +modules/evas/engines/gl_common/shader/font_frag.h \ +modules/evas/engines/gl_common/shader/font_vert.h \ +modules/evas/engines/gl_common/shader/img_frag.h \ +modules/evas/engines/gl_common/shader/img_vert.h \ +modules/evas/engines/gl_common/shader/img_nomul_frag.h \ +modules/evas/engines/gl_common/shader/img_nomul_vert.h \ +modules/evas/engines/gl_common/shader/img_bgra_frag.h \ +modules/evas/engines/gl_common/shader/img_bgra_vert.h \ +modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.h \ +modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.h \ +modules/evas/engines/gl_common/shader/img_mask_frag.h \ +modules/evas/engines/gl_common/shader/img_mask_vert.h \ +modules/evas/engines/gl_common/shader/nv12_nomul_vert.h \ +modules/evas/engines/gl_common/shader/nv12_vert.h \ +modules/evas/engines/gl_common/shader/nv12_nomul_frag.h \ +modules/evas/engines/gl_common/shader/nv12_frag.h \ +modules/evas/engines/gl_common/shader/yuv_frag.h \ +modules/evas/engines/gl_common/shader/yuv_vert.h \ +modules/evas/engines/gl_common/shader/yuv_nomul_frag.h \ +modules/evas/engines/gl_common/shader/yuv_nomul_vert.h \ +modules/evas/engines/gl_common/shader/tex_frag.h \ +modules/evas/engines/gl_common/shader/tex_vert.h \ +modules/evas/engines/gl_common/shader/tex_nomul_frag.h \ +modules/evas/engines/gl_common/shader/tex_nomul_vert.h \ +modules/evas/engines/gl_common/shader/filter_invert.h \ +modules/evas/engines/gl_common/shader/filter_invert_nomul.h \ +modules/evas/engines/gl_common/shader/filter_invert_bgra.h \ +modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.h \ +modules/evas/engines/gl_common/shader/filter_sepia.h \ +modules/evas/engines/gl_common/shader/filter_sepia_nomul.h \ +modules/evas/engines/gl_common/shader/filter_sepia_bgra.h \ +modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.h \ +modules/evas/engines/gl_common/shader/filter_greyscale.h \ +modules/evas/engines/gl_common/shader/filter_greyscale_nomul.h \ +modules/evas/engines/gl_common/shader/filter_greyscale_bgra.h \ +modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.h \ +modules/evas/engines/gl_common/shader/filter_blur.h \ +modules/evas/engines/gl_common/shader/filter_blur_nomul.h \ +modules/evas/engines/gl_common/shader/filter_blur_bgra.h \ +modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.h \ +modules/evas/engines/gl_common/shader/yuy2_frag.h \ +modules/evas/engines/gl_common/shader/yuy2_vert.h \ +modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h \ +modules/evas/engines/gl_common/shader/yuy2_nomul_vert.h +EXTRA_DIST += \ +modules/evas/engines/gl_common/shader/compile.sh \ +modules/evas/engines/gl_common/shader/make-c-str.sh \ +modules/evas/engines/gl_common/shader/rect_frag.shd \ +modules/evas/engines/gl_common/shader/rect_vert.shd \ +modules/evas/engines/gl_common/shader/font_frag.shd \ +modules/evas/engines/gl_common/shader/font_vert.shd \ +modules/evas/engines/gl_common/shader/img_frag.shd \ +modules/evas/engines/gl_common/shader/img_vert.shd \ +modules/evas/engines/gl_common/shader/img_nomul_frag.shd \ +modules/evas/engines/gl_common/shader/img_nomul_vert.shd \ +modules/evas/engines/gl_common/shader/img_bgra_vert.shd \ +modules/evas/engines/gl_common/shader/img_bgra_frag.shd \ +modules/evas/engines/gl_common/shader/img_bgra_vert.shd \ +modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd \ +modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd \ +modules/evas/engines/gl_common/shader/img_mask_frag.h \ +modules/evas/engines/gl_common/shader/img_mask_vert.h \ +modules/evas/engines/gl_common/shader/yuv_frag.shd \ +modules/evas/engines/gl_common/shader/yuv_vert.shd \ +modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd \ +modules/evas/engines/gl_common/shader/yuv_nomul_vert.shd \ +modules/evas/engines/gl_common/shader/tex_frag.shd \ +modules/evas/engines/gl_common/shader/tex_vert.shd \ +modules/evas/engines/gl_common/shader/tex_nomul_frag.shd \ +modules/evas/engines/gl_common/shader/tex_nomul_vert.shd \ +modules/evas/engines/gl_common/shader/filter_invert.shd \ +modules/evas/engines/gl_common/shader/filter_invert_nomul.shd \ +modules/evas/engines/gl_common/shader/filter_invert_bgra.shd \ +modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.shd \ +modules/evas/engines/gl_common/shader/filter_greyscale.shd \ +modules/evas/engines/gl_common/shader/filter_greyscale_nomul.shd \ +modules/evas/engines/gl_common/shader/filter_greyscale_bgra.shd \ +modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd \ +modules/evas/engines/gl_common/shader/filter_sepia.shd \ +modules/evas/engines/gl_common/shader/filter_sepia_nomul.shd \ +modules/evas/engines/gl_common/shader/filter_sepia_bgra.shd \ +modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.shd \ +modules/evas/engines/gl_common/shader/filter_blur.shd \ +modules/evas/engines/gl_common/shader/filter_blur_nomul.shd \ +modules/evas/engines/gl_common/shader/filter_blur_bgra.shd \ +modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.shd \ +modules/evas/engines/gl_common/shader/nv12_frag.h \ +modules/evas/engines/gl_common/shader/nv12_frag.shd \ +modules/evas/engines/gl_common/shader/nv12_nomul_frag.h \ +modules/evas/engines/gl_common/shader/nv12_nomul_frag.shd \ +modules/evas/engines/gl_common/shader/nv12_nomul_vert.h \ +modules/evas/engines/gl_common/shader/nv12_nomul_vert.shd \ +modules/evas/engines/gl_common/shader/nv12_vert.h \ +modules/evas/engines/gl_common/shader/nv12_vert.shd \ +modules/evas/engines/gl_common/shader/yuy2_frag.h \ +modules/evas/engines/gl_common/shader/yuy2_frag.shd \ +modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h \ +modules/evas/engines/gl_common/shader/yuy2_nomul_frag.shd \ +modules/evas/engines/gl_common/shader/yuy2_nomul_vert.h \ +modules/evas/engines/gl_common/shader/yuy2_nomul_vert.shd \ +modules/evas/engines/gl_common/shader/yuy2_vert.h \ +modules/evas/engines/gl_common/shader/yuy2_vert.shd +if EVAS_STATIC_BUILD_GL_COMMON +lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES) +lib_evas_libevas_la_LIBADD += @GL_EET_LIBS@ @evas_engine_gl_common_libs@ +else +noinst_LTLIBRARIES = modules/evas/engines/gl_common/libevas_engine_gl_common.la +modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) +modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@GL_EET_CFLAGS@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@GL_EET_LIBS@ +modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_GL_COCOA +dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h +GL_COCOA_SOURCES = \ +modules/evas/engines/gl_cocoa/evas_engine.c \ +modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m \ +modules/evas/engines/gl_cocoa/evas_engine.h +if EVAS_STATIC_BUILD_GL_COCOA +lib_evas_libevas_la_SOURCES += $(GL_COCOA_SOURCES) +lib_evas_libevas_la_CPPFLAGS += \ +-I$(top_srcdir)/src/modules/evas/engines/gl_common \ +@GL_EET_CFLAGS@ \ +@evas_engine_gl_cocoa_cflags@ +lib_evas_libevas_la_LIBADD += \ +lib/evas/libevas.la \ +modules/evas/engines/gl_common/libevas_engine_gl_common.la \ +@GL_EET_LIBS@ \ +@evas_engine_gl_cocoa_libs@ +else +engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH) +engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la +modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES) +modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/modules/evas/engines/gl_common \ +@evas_engine_gl_cocoa_cflags@ \ +@GL_EET_CFLAGS@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_gl_cocoa_module_la_LIBADD = \ +modules/evas/engines/gl_common/libevas_engine_gl_common.la \ +lib/evas/libevas.la \ +@GL_EET_LIBS@ \ +@EFL_LIBS@ \ +@evas_engine_gl_cocoa_libs@ +modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_GL_SDL +dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h +GL_SDL_SOURCES = \ +modules/evas/engines/gl_sdl/evas_engine.c \ +modules/evas/engines/gl_sdl/evas_engine.h +if EVAS_STATIC_BUILD_GL_SDL +lib_evas_libevas_la_SOURCES += $(GL_SDL_SOURCES) +lib_evas_libevas_la_CPPFLAGS += \ +-I$(top_srcdir)/src/modules/evas/engines/gl_common \ +@evas_engine_gl_sdl_cflags@ +lib_evas_libevas_la_LIBADD += \ +modules/evas/engines/gl_common/libevas_engine_gl_common.la \ +@evas_engine_gl_sdl_libs@ +else +engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH) +engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la +modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES) +modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/modules/evas/engines/gl_common \ +@evas_engine_gl_sdl_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_gl_sdl_module_la_LIBADD = \ +modules/evas/engines/gl_common/libevas_engine_gl_common.la \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_engine_gl_sdl_libs@ +modules_evas_engines_gl_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_GL_X11 +dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h +GL_X11_SOURCES = \ +modules/evas/engines/gl_x11/evas_engine.c \ +modules/evas/engines/gl_x11/evas_x_main.c \ +modules/evas/engines/gl_x11/evas_engine.h +if EVAS_STATIC_BUILD_GL_X11 +lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES) +lib_evas_libevas_la_CPPFLAGS += \ +-I$(top_srcdir)/src/modules/evas/engines/gl_common \ +@GL_EET_CFLAGS@ \ +@evas_engine_gl_xlib_cflags@ +lib_evas_libevas_la_LIBADD += \ +modules/evas/engines/gl_common/libevas_engine_gl_common.la \ +@evas_engine_gl_xlib_libs@ +else +engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH) +engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la +modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES) +modules_evas_engines_gl_x11_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/modules/evas/engines/gl_common \ +@evas_engine_gl_xlib_cflags@ \ +@GL_EET_CFLAGS@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_gl_x11_module_la_LIBADD = \ +modules/evas/engines/gl_common/libevas_engine_gl_common.la \ +lib/evas/libevas.la \ +@GL_EET_LIBS@ \ +@EFL_LIBS@ \ +@evas_engine_gl_xlib_libs@ +modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_PSL1GHT +dist_installed_evasmainheaders_DATA += modules/evas/engines/psl1ght/Evas_Engine_PSL1GHT.h +PSL1GHT_SOURCES = \ +modules/evas/engines/psl1ght/evas_engine.c \ +modules/evas/engines/psl1ght/rsxutil.c \ +modules/evas/engines/psl1ght/evas_engine.h \ +modules/evas/engines/psl1ght/rsxutil.h +if EVAS_STATIC_BUILD_PSL1GHT +lib_evas_libevas_la_SOURCES += $(PSL1GHT_SOURCES) +lib_evas_libevas_la_CPPFLAGS += @GL_EET_CFLAGS@ @evas_engine_psl1ght_cflags@ +lib_evas_libevas_la_LIBADD += @evas_engine_psl1ght_libs@ +else +enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH) +enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la +modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES) +modules_evas_engines_psl1ght_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@evas_engine_psl1ght_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_psl1ght_module_la_LIBADD = \ +lib/evas/libevas.la \ +@evas_engine_psl1ght_libs@ \ +@EFL_LIBS@ +modules_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_SOFTWARE_DDRAW +dist_installed_evasmainheaders_DATA += modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h +SOFTWARE_DDRAW_SOURCES = \ +modules/evas/engines/software_ddraw/evas_engine.c \ +modules/evas/engines/software_ddraw/evas_outbuf.c \ +modules/evas/engines/software_ddraw/evas_ddraw_buffer.c \ +modules/evas/engines/software_ddraw/evas_ddraw_main.cpp \ +modules/evas/engines/software_ddraw/evas_engine.h +if EVAS_STATIC_BUILD_SOFTWARE_DDRAW +lib_evas_libevas_la_SOURCES += $(SOFTWARE_DDRAW_SOURCES) +lib_evas_libevas_la_CPPFLAGS += @evas_engine_software_ddraw_cflags@ +lib_evas_libevas_la_CXXFLAGS += -fno-rtti -fno-exceptions +lib_evas_libevas_la_LIBADD += @evas_engine_software_ddraw_libs@ +else +enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH) +enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la +modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES) +modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@evas_engine_software_ddraw_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions +modules_evas_engines_software_ddraw_module_la_LIBADD = \ +lib/evas/libevas.la \ +@evas_engine_software_ddraw_libs@ \ +@EFL_LIBS@ +modules_evas_engines_software_ddraw_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_SOFTWARE_GDI +dist_installed_evasmainheaders_DATA += modules/evas/engines/software_gdi/Evas_Engine_Software_Gdi.h +SOFTWARE_GDI_SOURCES = \ +modules/evas/engines/software_gdi/evas_engine.c \ +modules/evas/engines/software_gdi/evas_outbuf.c \ +modules/evas/engines/software_gdi/evas_gdi_buffer.c \ +modules/evas/engines/software_gdi/evas_gdi_main.c \ +modules/evas/engines/software_gdi/evas_engine.h +if EVAS_STATIC_BUILD_SOFTWARE_GDI +lib_evas_libevas_la_SOURCES += $(SOFTWARE_GDI_SOURCES) +lib_evas_libevas_la_CPPFLAGS += @evas_engine_software_gdi_cflags@ +lib_evas_libevas_la_LIBADD += @evas_engine_software_gdi_libs@ +else +enginesoftwaregdipkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH) +enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la +modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES) +modules_evas_engines_software_gdi_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@evas_engine_software_gdi_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_software_gdi_module_la_LIBADD = \ +lib/evas/libevas.la \ +@evas_engine_software_gdi_libs@ \ +@EFL_LIBS@ +modules_evas_engines_software_gdi_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_SOFTWARE_X11 +dist_installed_evasmainheaders_DATA += modules/evas/engines/software_x11/Evas_Engine_Software_X11.h +SOFTWARE_X11_SOURCES = \ +modules/evas/engines/software_x11/evas_engine.c \ +modules/evas/engines/software_x11/evas_x_egl.c \ +modules/evas/engines/software_x11/evas_x_egl.h +SOFTWARE_X11_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +SOFTWARE_X11_LIBADD = +if BUILD_ENGINE_SOFTWARE_XLIB +SOFTWARE_X11_SOURCES += \ +modules/evas/engines/software_x11/evas_xlib_outbuf.c \ +modules/evas/engines/software_x11/evas_xlib_buffer.c \ +modules/evas/engines/software_x11/evas_xlib_color.c \ +modules/evas/engines/software_x11/evas_xlib_main.c +SOFTWARE_X11_CPPFLAGS += @evas_engine_software_xlib_cflags@ +SOFTWARE_X11_LIBADD += @evas_engine_software_xlib_libs@ +endif +if BUILD_ENGINE_SOFTWARE_XCB +SOFTWARE_X11_SOURCES += \ +modules/evas/engines/software_x11/evas_xcb_xdefaults.c \ +modules/evas/engines/software_x11/evas_xcb_outbuf.c \ +modules/evas/engines/software_x11/evas_xcb_buffer.c \ +modules/evas/engines/software_x11/evas_xcb_color.c \ +modules/evas/engines/software_x11/evas_xcb_main.c \ +modules/evas/engines/software_x11/evas_engine.h \ +modules/evas/engines/software_x11/evas_xlib_outbuf.h \ +modules/evas/engines/software_x11/evas_xlib_buffer.h \ +modules/evas/engines/software_x11/evas_xlib_color.h \ +modules/evas/engines/software_x11/evas_xcb_outbuf.h \ +modules/evas/engines/software_x11/evas_xcb_buffer.h \ +modules/evas/engines/software_x11/evas_xcb_color.h \ +modules/evas/engines/software_x11/evas_xcb_xdefaults.h +SOFTWARE_X11_CPPFLAGS += @evas_engine_software_xcb_cflags@ +SOFTWARE_X11_LIBADD += @evas_engine_software_xcb_libs@ +endif +if EVAS_STATIC_BUILD_SOFTWARE_X11 +lib_evas_libevas_la_SOURCES += $(SOFTWARE_X11_SOURCES) +lib_evas_libevas_la_CPPFLAGS += $(SOFTWARE_X11_CPPFLAGS) +lib_evas_libevas_la_LIBADD += $(SOFTWARE_X11_LIBADD) +else +enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH) +enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la +modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES) +modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS) +modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ $(SOFTWARE_X11_LIBADD) +modules_evas_engines_software_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_WAYLAND_EGL +dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h +WAYLAND_EGL_SOURCES = \ +modules/evas/engines/wayland_egl/evas_engine.c \ +modules/evas/engines/wayland_egl/evas_wl_main.c \ +modules/evas/engines/wayland_egl/evas_engine.h +if EVAS_STATIC_BUILD_WAYLAND_EGL +lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES) +lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_egl_cflags@ +lib_evas_libevas_la_LIBADD += lib/evas/libevas.la @EFL_LIBS@ @evas_engine_wayland_egl_libs@ +else +enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) +enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la +modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES) +modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@evas_engine_wayland_egl_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_wayland_egl_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_engine_wayland_egl_libs@ +modules_evas_engines_wayland_egl_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_ENGINE_WAYLAND_SHM +dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h +WAYLAND_SHM_SOURCES = \ +modules/evas/engines/wayland_shm/evas_engine.c \ +modules/evas/engines/wayland_shm/evas_outbuf.c \ +modules/evas/engines/wayland_shm/evas_engine.h +if EVAS_STATIC_BUILD_WAYLAND_SHM +lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES) +lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@ +lib_evas_libevas_la_LIBADD += lib/evas/libevas.la @EFL_LIBS@ @evas_engine_wayland_shm_libs@ +else +enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH) +enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la +modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES) +modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@evas_engine_wayland_shm_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_engines_wayland_shm_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_engine_wayland_shm_libs@ +modules_evas_engines_wayland_shm_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +### Loaders and savers + +if BUILD_LOADER_BMP +if EVAS_STATIC_BUILD_BMP +lib_evas_libevas_la_SOURCES += modules/evas/loaders/bmp/evas_image_load_bmp.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_bmp_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_bmp_libs@ +else +loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH) +loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la +modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c +modules_evas_loaders_bmp_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_bmp_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_bmp_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_bmp_libs@ \ +-lm +modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_EET +if EVAS_STATIC_BUILD_EET +lib_evas_libevas_la_SOURCES += modules/evas/loaders/eet/evas_image_load_eet.c modules/evas/savers/eet/evas_image_save_eet.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_eet_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_eet_libs@ +else +loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH) +loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la +modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c +modules_evas_loaders_eet_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eet \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_eet_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_eet_module_la_LIBADD = \ +lib/evas/libevas.la \ +lib/evas/libeet.la \ +@evas_image_loader_eet_libs@ +modules_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_GENERIC +if EVAS_STATIC_BUILD_GENERIC +lib_evas_libevas_la_SOURCES += modules/evas/loaders/generic/evas_image_load_generic.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_generic_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_generic_libs@ +else +loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH) +loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la +modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c +modules_evas_loaders_generic_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_generic_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_generic_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_generic_libs@ +modules_evas_loaders_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_GIF +if EVAS_STATIC_BUILD_GIF +lib_evas_libevas_la_SOURCES += modules/evas/loaders/gif/evas_image_load_gif.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_gif_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_gif_libs@ +else +loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH) +loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la +modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c +modules_evas_loaders_gif_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_gif_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_gif_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_gif_libs@ +modules_evas_loaders_gif_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_ICO +if EVAS_STATIC_BUILD_ICO +lib_evas_libevas_la_SOURCES += modules/evas/loaders/ico/evas_image_load_ico.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_ico_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_ico_libs@ +else +loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH) +loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la +modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c +modules_evas_loaders_ico_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_ico_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_ico_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_ico_libs@ +modules_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_JPEG +if EVAS_STATIC_BUILD_JPEG +lib_evas_libevas_la_SOURCES += modules/evas/loaders/jpeg/evas_image_load_jpeg.c +if BUILD_SAVER_JPEG +lib_evas_libevas_la_SOURCES += modules/evas/savers/jpeg/evas_image_save_jpeg.c +endif +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_jpeg_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_jpeg_libs@ +else +loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH) +loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la +modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c +modules_evas_loaders_jpeg_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_jpeg_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_jpeg_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_jpeg_libs@ +modules_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static +if BUILD_SAVER_JPEG +saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) +saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la +modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c +modules_evas_savers_jpeg_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_jpeg_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_savers_jpeg_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_jpeg_libs@ +modules_evas_savers_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif +endif + +if BUILD_LOADER_PMAPS +if EVAS_STATIC_BUILD_PMAPS +lib_evas_libevas_la_SOURCES += modules/evas/loaders/pmaps/evas_image_load_pmaps.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_pmaps_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_pmaps_libs@ +else +loaderpmapspkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH) +loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la +modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c +modules_evas_loaders_pmaps_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_pmaps_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_pmaps_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_pmaps_libs@ +modules_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_PNG +if EVAS_STATIC_BUILD_PNG +lib_evas_libevas_la_SOURCES += modules/evas/loaders/png/evas_image_load_png.c modules/evas/savers/png/evas_image_save_png.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_png_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_png_libs@ +else +loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) +loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la +modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c +modules_evas_loaders_png_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_png_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_png_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_png_libs@ +modules_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static + +saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) +saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la +modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c +modules_evas_savers_png_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_png_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_savers_png_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_png_libs@ +modules_evas_savers_png_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_PSD +if EVAS_STATIC_BUILD_PSD +lib_evas_libevas_la_SOURCES += modules/evas/loaders/psd/evas_image_load_psd.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_psd_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_psd_libs@ +else +loaderpsdpkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH) +loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la +modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c +modules_evas_loaders_psd_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_psd_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_psd_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_psd_libs@ +modules_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_SVG +if EVAS_STATIC_BUILD_SVG +lib_evas_libevas_la_SOURCES += modules/evas/loaders/svg/evas_image_load_esvg.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_svg_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_svg_libs@ +else +loadersvgpkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH) +loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la +modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c +modules_evas_loaders_svg_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_svg_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_svg_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_svg_libs@ +modules_evas_loaders_svg_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_TGA +if EVAS_STATIC_BUILD_TGA +lib_evas_libevas_la_SOURCES += modules/evas/loaders/tga/evas_image_load_tga.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tga_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_tga_libs@ +else +loadertgapkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH) +loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la +modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c +modules_evas_loaders_tga_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_tga_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_tga_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_tga_libs@ +modules_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_TIFF +if EVAS_STATIC_BUILD_TIFF +lib_evas_libevas_la_SOURCES += modules/evas/loaders/tiff/evas_image_load_tiff.c modules/evas/savers/tiff/evas_image_save_tiff.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tiff_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_tiff_libs@ +else +loadertiffpkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH) +loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la +modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c +modules_evas_loaders_tiff_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_tiff_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_tiff_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_tiff_libs@ +modules_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static + +savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) +savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la +modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c +modules_evas_savers_tiff_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_tiff_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_savers_tiff_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_tiff_libs@ +modules_evas_savers_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_WBMP +if EVAS_STATIC_BUILD_WBMP +lib_evas_libevas_la_SOURCES += modules/evas/loaders/wbmp/evas_image_load_wbmp.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_wbmp_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_wbmp_libs@ +else +loaderwbmppkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH) +loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la +modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c +modules_evas_loaders_wbmp_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_wbmp_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_wbmp_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_wbmp_libs@ +modules_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_WEBP +if EVAS_STATIC_BUILD_WEBP +lib_evas_libevas_la_SOURCES += modules/evas/loaders/webp/evas_image_load_webp.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_webp_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_webp_libs@ +else +loaderwebppkgdir = $(libdir)/evas/modules/loaders/webp/$(MODULE_ARCH) +loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la +modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c +modules_evas_loaders_webp_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_webp_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_webp_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_webp_libs@ +modules_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +if BUILD_LOADER_XPM +if EVAS_STATIC_BUILD_XPM +lib_evas_libevas_la_SOURCES += modules/evas/loaders/xpm/evas_image_load_xpm.c +lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_xpm_cflags@ +lib_evas_libevas_la_LIBADD += @evas_image_loader_xpm_libs@ +else +loaderxpmpkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH) +loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la +modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c +modules_evas_loaders_xpm_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +@evas_image_loader_xpm_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +modules_evas_loaders_xpm_module_la_LIBADD = \ +lib/evas/libevas.la \ +@EFL_LIBS@ \ +@evas_image_loader_xpm_libs@ +modules_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static +endif +endif + +### binary + +libexec_PROGRAMS = \ +bin/evas/evas_cserve2 \ +bin/evas/evas_cserve2_slave \ +bin/evas/dummy_slave + +bin_PROGRAMS += \ +bin/evas/evas_cserve2_client \ +bin/evas/evas_cserve2_usage \ +bin/evas/evas_cserve2_debug + +bin_evas_evas_cserve2_SOURCES = \ +bin/evas/evas_cserve2.h \ +bin/evas/evas_cserve2_slave.h \ +bin/evas/evas_cserve2_main.c \ +bin/evas/evas_cserve2_slaves.c \ +bin/evas/evas_cserve2_messages.c \ +bin/evas/evas_cserve2_shm.c \ +bin/evas/evas_cserve2_cache.c \ +bin/evas/evas_cserve2_requests.c \ +bin/evas/evas_cserve2_fonts.c \ +bin/evas/evas_cserve2_main_loop_linux.c \ +lib/evas/cserve2/evas_cs2_utils.h \ +lib/evas/cserve2/evas_cs2_utils.c + +bin_evas_evas_cserve2_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/lib/eet \ +-I$(top_builddir)/src/lib/eet \ +-DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \ +@EVAS_CFLAGS@ \ +@EFL_CFLAGS@ + +bin_evas_evas_cserve2_LDADD = \ +@EVAS_LIBS@ \ +@EFL_LIBS@ \ +lib/eet/libeet.la \ +lib/evas/libevas.la + +bin_evas_evas_cserve2_client_SOURCES = \ +bin/evas/evas_cserve2_client.c + +bin_evas_evas_cserve2_client_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@EVAS_CFLAGS@ \ +@EFL_CFLAGS@ + +bin_evas_evas_cserve2_usage_SOURCES = \ +bin/evas/evas_cserve2_usage.c + +bin_evas_evas_cserve2_usage_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@EVAS_CFLAGS@ \ +@EFL_CFLAGS@ + +bin_evas_evas_cserve2_usage_LDADD = \ +lib/eina/libeina.la \ +@EFL_LIBS@ \ +@EVAS_LIBS@ + +bin_evas_evas_cserve2_debug_SOURCES = \ +bin/evas/evas_cserve2_debug.c + +bin_evas_evas_cserve2_debug_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@EVAS_CFLAGS@ \ +@EFL_CFLAGS@ + +bin_evas_evas_cserve2_debug_LDADD = \ +lib/eina/libeina.la \ +@EFL_LIBS@ \ +@EVAS_LIBS@ + +bin_evas_evas_cserve2_slave_SOURCES = \ +bin/evas/evas_cserve2_slave.c \ +bin/evas/evas_cserve2_utils.c + +bin_evas_evas_cserve2_slave_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +@EVAS_CFLAGS@ \ +@EFL_CFLAGS@ + +bin_evas_evas_cserve2_slave_LDADD = \ +lib/eina/libeina.la \ +@EFL_LIBS@ \ +@EVAS_LIBS@ + +bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic + +bin_evas_dummy_slave_SOURCES = \ +bin/evas/dummy_slave.c + +bin_evas_dummy_slave_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +@EVAS_CFLAGS@ \ +@EFL_CFLAGS@ + +bin_evas_dummy_slave_LDADD = \ +lib/eina/libeina.la \ +@EFL_LIBS@ \ +@EVAS_LIBS@ + +### Cserve2 loaders + +if BUILD_LOADER_BMP +cserve2bmppkgdir = $(libdir)/evas/cserve2/loaders/bmp/$(MODULE_ARCH) +cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la +bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c +bin_evas_loaders_bmp_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm +bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_EET +cserve2eetpkgdir = $(libdir)/evas/cserve2/loaders/eet/$(MODULE_ARCH) +cserve2eetpkg_LTLIBRARIES = bin/evas/loaders/eet/module.la +bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c +bin_evas_loaders_eet_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/eet \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_eet_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_eet_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_eet_libs@ +bin_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_ICO +cserve2icopkgdir = $(libdir)/evas/cserve2/loaders/ico/$(MODULE_ARCH) +cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la +bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c +bin_evas_loaders_ico_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_ico_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_ico_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_ico_libs@ +bin_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_JPEG +cserve2jpegpkgdir = $(libdir)/evas/cserve2/loaders/jpeg/$(MODULE_ARCH) +cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la +bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c +bin_evas_loaders_jpeg_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_jpeg_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_jpeg_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_jpeg_libs@ +bin_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_PMAPS +cserve2pmapspkgdir = $(libdir)/evas/cserve2/loaders/pmaps/$(MODULE_ARCH) +cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la +bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c +bin_evas_loaders_pmaps_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_pmaps_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_pmaps_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_pmaps_libs@ +bin_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_PNG +cserve2pngpkgdir = $(libdir)/evas/cserve2/loaders/png/$(MODULE_ARCH) +cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la +bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c +bin_evas_loaders_png_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_png_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_png_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_png_libs@ +bin_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_PSD +cserve2psdpkgdir = $(libdir)/evas/cserve2/loaders/psd/$(MODULE_ARCH) +cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la +bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c +bin_evas_loaders_psd_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_psd_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_psd_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_psd_libs@ +bin_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_TGA +cserve2tgapkgdir = $(libdir)/evas/cserve2/loaders/tga/$(MODULE_ARCH) +cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la +bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c +bin_evas_loaders_tga_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_tga_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_tga_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tga_libs@ +bin_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_TIFF +cserve2tiffpkgdir = $(libdir)/evas/cserve2/loaders/tiff/$(MODULE_ARCH) +cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la +bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c +bin_evas_loaders_tiff_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_tiff_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_tiff_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tiff_libs@ +bin_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_WBMP +cserve2wbmppkgdir = $(libdir)/evas/cserve2/loaders/wbmp/$(MODULE_ARCH) +cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la +bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c +bin_evas_loaders_wbmp_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_wbmp_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_wbmp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_wbmp_libs@ +bin_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_WEBP +cserve2webppkgdir = $(libdir)/evas/cserve2/loaders/webp/$(MODULE_ARCH) +cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la +bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c +bin_evas_loaders_webp_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_webp_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_webp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_webp_libs@ +bin_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static +endif + +if BUILD_LOADER_XPM +cserve2xpmpkgdir = $(libdir)/evas/cserve2/loaders/xpm/$(MODULE_ARCH) +cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la +bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c +bin_evas_loaders_xpm_module_la_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/include \ +-I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_srcdir)/src/bin/evas \ +@evas_image_loader_xpm_cflags@ \ +@EFL_CFLAGS@ \ +@EVAS_CFLAGS@ +bin_evas_loaders_xpm_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_xpm_libs@ +bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version +bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static +endif \ No newline at end of file diff --git a/legacy/evas/src/bin/dummy_slave.c b/src/bin/evas/dummy_slave.c similarity index 97% rename from legacy/evas/src/bin/dummy_slave.c rename to src/bin/evas/dummy_slave.c index 398d86eceb..ba815dc661 100644 --- a/legacy/evas/src/bin/dummy_slave.c +++ b/src/bin/evas/dummy_slave.c @@ -115,7 +115,7 @@ _cserve2_shm_unmap(void *map, size_t length) */ static Error_Type -image_open(const char *file __UNUSED__, const char *key __UNUSED__, Slave_Msg_Image_Opened *result) +image_open(const char *file EINA_UNUSED, const char *key EINA_UNUSED, Slave_Msg_Image_Opened *result) { memset(result, 0, sizeof(*result)); result->w = 32; diff --git a/legacy/evas/src/bin/evas_cserve2.h b/src/bin/evas/evas_cserve2.h similarity index 100% rename from legacy/evas/src/bin/evas_cserve2.h rename to src/bin/evas/evas_cserve2.h diff --git a/legacy/evas/src/bin/evas_cserve2_cache.c b/src/bin/evas/evas_cserve2_cache.c similarity index 97% rename from legacy/evas/src/bin/evas_cserve2_cache.c rename to src/bin/evas/evas_cserve2_cache.c index 5e7783b583..6ae8a42a6c 100644 --- a/legacy/evas/src/bin/evas_cserve2_cache.c +++ b/src/bin/evas/evas_cserve2_cache.c @@ -352,7 +352,7 @@ _open_request_build(File_Data *f, int *bufsize) } static void -_request_free(void *msg, void *data __UNUSED__) +_request_free(void *msg, void *data EINA_UNUSED) { free(msg); } @@ -381,7 +381,7 @@ _open_request_response(File_Data *e, Slave_Msg_Image_Opened *resp, int *size) } static void -_request_failed(Entry *e, Error_Type type __UNUSED__) +_request_failed(Entry *e, Error_Type type EINA_UNUSED) { Eina_List *l; Reference *ref; @@ -628,7 +628,7 @@ _file_watch_free(void *data) } static int -_font_entry_cmp(const Font_Entry *k1, int k1_length __UNUSED__, const Font_Entry *k2, int k2_length __UNUSED__) +_font_entry_cmp(const Font_Entry *k1, int k1_length EINA_UNUSED, const Font_Entry *k2, int k2_length EINA_UNUSED) { if (k1->src->key == k2->src->key) { @@ -644,7 +644,7 @@ _font_entry_cmp(const Font_Entry *k1, int k1_length __UNUSED__, const Font_Entry } static int -_font_entry_key_hash(const Font_Entry *key, int key_length __UNUSED__) +_font_entry_key_hash(const Font_Entry *key, int key_length EINA_UNUSED) { int hash; hash = eina_hash_djb2(key->src->key, eina_stringshare_strlen(key->src->key) + 1); @@ -978,7 +978,7 @@ _image_msg_new(Client *client, Msg_Setopts *msg) } static void -_file_changed_cb(const char *path __UNUSED__, Eina_Bool deleted __UNUSED__, void *data) +_file_changed_cb(const char *path EINA_UNUSED, Eina_Bool deleted EINA_UNUSED, void *data) { File_Watch *fw = data; File_Data *e; @@ -1067,7 +1067,7 @@ _font_load_request_build(void *data, int *size) } static void -_font_load_request_free(void *msg, void *data __UNUSED__) +_font_load_request_free(void *msg, void *data EINA_UNUSED) { free(msg); } @@ -1097,7 +1097,7 @@ _font_load_request_response(Font_Entry *fe, Slave_Msg_Font_Loaded *msg, int *siz } static void -_font_load_request_failed(Font_Entry *fe, Error_Type error __UNUSED__) +_font_load_request_failed(Font_Entry *fe, Error_Type error EINA_UNUSED) { Eina_List *l; Reference *ref; @@ -1405,7 +1405,7 @@ _glyphs_load_request_prepare(Glyphs_Request *req) } static void * -_glyphs_load_request_build(void *data, int *size __UNUSED__) +_glyphs_load_request_build(void *data, int *size EINA_UNUSED) { Glyphs_Request *req = data; Slave_Msg_Font_Glyphs_Load *msg = NULL; @@ -1516,7 +1516,7 @@ _glyphs_load_request_response(Glyphs_Request *req, Slave_Msg_Font_Glyphs_Loaded } static void -_glyphs_load_request_failed(void *data __UNUSED__, Error_Type error __UNUSED__) +_glyphs_load_request_failed(void *data EINA_UNUSED, Error_Type error EINA_UNUSED) { } @@ -1528,7 +1528,7 @@ static Slave_Request_Funcs _glyphs_load_funcs = { }; static Eina_Bool -_font_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_font_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { Font_Entry *fe = data; Msg_Stats *msg = fdata; @@ -1577,7 +1577,7 @@ _font_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED_ } static Eina_Bool -_image_file_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_image_file_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { Msg_Stats *msg = fdata; File_Data *fd = data; @@ -1601,7 +1601,7 @@ _image_file_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __U } static Eina_Bool -_image_data_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_image_data_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { Msg_Stats *msg = fdata; Image_Data *id = data; @@ -1648,7 +1648,7 @@ struct _debug_info }; static Eina_Bool -_font_entry_debug_size_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_font_entry_debug_size_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { struct _debug_info *di = fdata; unsigned int size = di->size; @@ -1713,7 +1713,7 @@ _font_entry_debug_size_cb(const Eina_Hash *hash __UNUSED__, const void *key __UN } static Eina_Bool -_font_entry_debug_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_font_entry_debug_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { char **pos = fdata; char *buf = *pos; @@ -2222,7 +2222,7 @@ cserve2_cache_font_load(Client *client, const char *source, unsigned int sourcel } int -cserve2_cache_font_unload(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int rid __UNUSED__) +cserve2_cache_font_unload(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int rid EINA_UNUSED) { Font_Entry *fe; char *fullname; @@ -2276,7 +2276,7 @@ cserve2_cache_font_glyphs_load(Client *client, const char *source, unsigned int } int -cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid __UNUSED__) +cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid EINA_UNUSED) { Glyphs_Group *gg; Eina_List *groups; diff --git a/legacy/evas/src/bin/evas_cserve2_client.c b/src/bin/evas/evas_cserve2_client.c similarity index 100% rename from legacy/evas/src/bin/evas_cserve2_client.c rename to src/bin/evas/evas_cserve2_client.c diff --git a/legacy/evas/src/bin/evas_cserve2_debug.c b/src/bin/evas/evas_cserve2_debug.c similarity index 100% rename from legacy/evas/src/bin/evas_cserve2_debug.c rename to src/bin/evas/evas_cserve2_debug.c diff --git a/legacy/evas/src/bin/evas_cserve2_fonts.c b/src/bin/evas/evas_cserve2_fonts.c similarity index 98% rename from legacy/evas/src/bin/evas_cserve2_fonts.c rename to src/bin/evas/evas_cserve2_fonts.c index cd6adabf52..211ee47509 100644 --- a/legacy/evas/src/bin/evas_cserve2_fonts.c +++ b/src/bin/evas/evas_cserve2_fonts.c @@ -239,7 +239,7 @@ _font_slave_int_load(const Slave_Msg_Font_Load *msg, Font_Source_Info *fsi) } static Slave_Msg_Font_Loaded * -_font_slave_load(const void *cmddata, void *data __UNUSED__) +_font_slave_load(const void *cmddata, void *data EINA_UNUSED) { const Slave_Msg_Font_Load *msg = cmddata; Slave_Msg_Font_Loaded *response; @@ -450,7 +450,7 @@ _timeval_sub(const struct timeval *tv2, const struct timeval *tv1) #endif static Slave_Msg_Font_Glyphs_Loaded * -_font_slave_glyphs_load(const void *cmddata, void *data __UNUSED__) +_font_slave_glyphs_load(const void *cmddata, void *data EINA_UNUSED) { const Slave_Msg_Font_Glyphs_Load *msg = cmddata; Slave_Msg_Font_Glyphs_Loaded *response; @@ -559,7 +559,7 @@ _font_slave_glyphs_load(const void *cmddata, void *data __UNUSED__) } void * -cserve2_font_slave_cb(Slave_Thread_Data *sd __UNUSED__, Slave_Command *cmd, const void *cmddata, void *data) +cserve2_font_slave_cb(Slave_Thread_Data *sd EINA_UNUSED, Slave_Command *cmd, const void *cmddata, void *data) { void *response = NULL; diff --git a/legacy/evas/src/bin/evas_cserve2_main.c b/src/bin/evas/evas_cserve2_main.c similarity index 99% rename from legacy/evas/src/bin/evas_cserve2_main.c rename to src/bin/evas/evas_cserve2_main.c index 0f4afcbe06..8b72ecc4ed 100644 --- a/legacy/evas/src/bin/evas_cserve2_main.c +++ b/src/bin/evas/evas_cserve2_main.c @@ -309,7 +309,7 @@ _clients_finish(void) } int -main(int argc __UNUSED__, const char *argv[] __UNUSED__) +main(int argc EINA_UNUSED, const char *argv[] EINA_UNUSED) { eina_init(); diff --git a/legacy/evas/src/bin/evas_cserve2_main_loop_linux.c b/src/bin/evas/evas_cserve2_main_loop_linux.c similarity index 97% rename from legacy/evas/src/bin/evas_cserve2_main_loop_linux.c rename to src/bin/evas/evas_cserve2_main_loop_linux.c index e8da352984..afd678ee3e 100644 --- a/legacy/evas/src/bin/evas_cserve2_main_loop_linux.c +++ b/src/bin/evas/evas_cserve2_main_loop_linux.c @@ -65,7 +65,7 @@ static Main_Loop_Child_Dead_Cb reap_children_func = NULL; #endif static void -_signal_handle_child(struct signalfd_siginfo *sinfo __UNUSED__) +_signal_handle_child(struct signalfd_siginfo *sinfo EINA_UNUSED) { int status; pid_t pid; @@ -90,21 +90,21 @@ _signal_handle_child(struct signalfd_siginfo *sinfo __UNUSED__) } static void -_signal_handle_int(struct signalfd_siginfo *sinfo __UNUSED__) +_signal_handle_int(struct signalfd_siginfo *sinfo EINA_UNUSED) { DBG("Received SIGINT. Honoring request."); terminate = EINA_TRUE; } static void -_signal_handle_term(struct signalfd_siginfo *sinfo __UNUSED__) +_signal_handle_term(struct signalfd_siginfo *sinfo EINA_UNUSED) { DBG("Received SIGTERM. Honoring request."); terminate = EINA_TRUE; } static void -_signalfd_handler(int fd, Fd_Flags flags __UNUSED__, void *data __UNUSED__) +_signalfd_handler(int fd, Fd_Flags flags EINA_UNUSED, void *data EINA_UNUSED) { struct signalfd_siginfo sinfo; ssize_t ret; @@ -180,7 +180,7 @@ _signalfd_finish(void) } static void -_socketfd_handler(int fd __UNUSED__, Fd_Flags flags __UNUSED__, void *data __UNUSED__) +_socketfd_handler(int fd EINA_UNUSED, Fd_Flags flags EINA_UNUSED, void *data EINA_UNUSED) { struct sockaddr_un remote; unsigned int len; @@ -283,7 +283,7 @@ _socketfd_finish(void) } static void -_inotifyfd_handler(int fd, Fd_Flags flags, void *data __UNUSED__) +_inotifyfd_handler(int fd, Fd_Flags flags, void *data EINA_UNUSED) { char buffer[16384]; int i = 0; diff --git a/legacy/evas/src/bin/evas_cserve2_messages.c b/src/bin/evas/evas_cserve2_messages.c similarity index 98% rename from legacy/evas/src/bin/evas_cserve2_messages.c rename to src/bin/evas/evas_cserve2_messages.c index 14a2bec144..e5cb1b7ee8 100644 --- a/legacy/evas/src/bin/evas_cserve2_messages.c +++ b/src/bin/evas/evas_cserve2_messages.c @@ -67,7 +67,7 @@ _client_msg_read(Client *client, int done) } void -cserve2_message_handler(int fd __UNUSED__, Fd_Flags flags, void *data) +cserve2_message_handler(int fd EINA_UNUSED, Fd_Flags flags, void *data) { Client *client = data; int len; diff --git a/legacy/evas/src/bin/evas_cserve2_requests.c b/src/bin/evas/evas_cserve2_requests.c similarity index 99% rename from legacy/evas/src/bin/evas_cserve2_requests.c rename to src/bin/evas/evas_cserve2_requests.c index f155a224b3..2fe540d1fa 100644 --- a/legacy/evas/src/bin/evas_cserve2_requests.c +++ b/src/bin/evas/evas_cserve2_requests.c @@ -325,7 +325,7 @@ _cserve2_request_failed(Slave_Request *req, Error_Type type) } static void -_slave_read_cb(Slave *s __UNUSED__, Slave_Command cmd, void *msg, void *data) +_slave_read_cb(Slave *s EINA_UNUSED, Slave_Command cmd, void *msg, void *data) { Slave_Worker *sw = data; Slave_Request *dep, *req = sw->data; @@ -395,7 +395,7 @@ free_it: } static void -_slave_dead_cb(Slave *s __UNUSED__, void *data) +_slave_dead_cb(Slave *s EINA_UNUSED, void *data) { Slave_Worker *sw = data; Slave_Request *req = sw->data; diff --git a/legacy/evas/src/bin/evas_cserve2_shm.c b/src/bin/evas/evas_cserve2_shm.c similarity index 100% rename from legacy/evas/src/bin/evas_cserve2_shm.c rename to src/bin/evas/evas_cserve2_shm.c diff --git a/legacy/evas/src/bin/evas_cserve2_slave.c b/src/bin/evas/evas_cserve2_slave.c similarity index 100% rename from legacy/evas/src/bin/evas_cserve2_slave.c rename to src/bin/evas/evas_cserve2_slave.c diff --git a/legacy/evas/src/bin/evas_cserve2_slave.h b/src/bin/evas/evas_cserve2_slave.h similarity index 100% rename from legacy/evas/src/bin/evas_cserve2_slave.h rename to src/bin/evas/evas_cserve2_slave.h diff --git a/legacy/evas/src/bin/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c similarity index 99% rename from legacy/evas/src/bin/evas_cserve2_slaves.c rename to src/bin/evas/evas_cserve2_slaves.c index 542a4fb4fe..92f04e29e0 100644 --- a/legacy/evas/src/bin/evas_cserve2_slaves.c +++ b/src/bin/evas/evas_cserve2_slaves.c @@ -124,7 +124,7 @@ _slave_thread_free(Slave_Thread *s) } static void -_slave_proc_dead_cb(int pid, int status __UNUSED__) +_slave_proc_dead_cb(int pid, int status EINA_UNUSED) { Slave_Proc *s; @@ -167,7 +167,7 @@ _slave_write(Slave *s, const char *data, size_t size) } static void -_slave_write_cb(int fd __UNUSED__, Fd_Flags flags __UNUSED__, void *data) +_slave_write_cb(int fd EINA_UNUSED, Fd_Flags flags EINA_UNUSED, void *data) { Slave *s = data; size_t sent; diff --git a/legacy/evas/src/bin/evas_cserve2_usage.c b/src/bin/evas/evas_cserve2_usage.c similarity index 100% rename from legacy/evas/src/bin/evas_cserve2_usage.c rename to src/bin/evas/evas_cserve2_usage.c diff --git a/legacy/evas/src/bin/evas_cserve2_utils.c b/src/bin/evas/evas_cserve2_utils.c similarity index 100% rename from legacy/evas/src/bin/evas_cserve2_utils.c rename to src/bin/evas/evas_cserve2_utils.c diff --git a/legacy/evas/src/bin/loaders/bmp/evas_image_load_bmp.c b/src/bin/evas/loaders/bmp/evas_image_load_bmp.c similarity index 99% rename from legacy/evas/src/bin/loaders/bmp/evas_image_load_bmp.c rename to src/bin/evas/loaders/bmp/evas_image_load_bmp.c index 4a00547d07..4a117521fe 100644 --- a/legacy/evas/src/bin/loaders/bmp/evas_image_load_bmp.c +++ b/src/bin/evas/loaders/bmp/evas_image_load_bmp.c @@ -91,7 +91,7 @@ read_mem(unsigned char *map, size_t length, size_t *position, void *buffer, int } static Eina_Bool -evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map = NULL; @@ -368,7 +368,7 @@ evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const } static Eina_Bool -evas_image_load_file_data_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map = NULL; diff --git a/legacy/evas/src/bin/loaders/eet/evas_image_load_eet.c b/src/bin/evas/loaders/eet/evas_image_load_eet.c similarity index 100% rename from legacy/evas/src/bin/loaders/eet/evas_image_load_eet.c rename to src/bin/evas/loaders/eet/evas_image_load_eet.c diff --git a/legacy/evas/src/bin/loaders/ico/evas_image_load_ico.c b/src/bin/evas/loaders/ico/evas_image_load_ico.c similarity index 100% rename from legacy/evas/src/bin/loaders/ico/evas_image_load_ico.c rename to src/bin/evas/loaders/ico/evas_image_load_ico.c diff --git a/legacy/evas/src/bin/loaders/jpeg/evas_image_load_jpeg.c b/src/bin/evas/loaders/jpeg/evas_image_load_jpeg.c similarity index 99% rename from legacy/evas/src/bin/loaders/jpeg/evas_image_load_jpeg.c rename to src/bin/evas/loaders/jpeg/evas_image_load_jpeg.c index d1b1a7977c..78fcc1f76a 100644 --- a/legacy/evas/src/bin/loaders/jpeg/evas_image_load_jpeg.c +++ b/src/bin/evas/loaders/jpeg/evas_image_load_jpeg.c @@ -35,7 +35,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo) } static void -_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) +_JPEGErrorHandler(j_common_ptr cinfo EINA_UNUSED) { /* emptr errmgr; */ @@ -46,7 +46,7 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) } static void -_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__, int msg_level __UNUSED__) +_JPEGErrorHandler2(j_common_ptr cinfo EINA_UNUSED, int msg_level EINA_UNUSED) { /* emptr errmgr; */ @@ -66,7 +66,7 @@ struct jpeg_membuf_src }; static void -_evas_jpeg_membuf_src_init(j_decompress_ptr cinfo __UNUSED__) +_evas_jpeg_membuf_src_init(j_decompress_ptr cinfo EINA_UNUSED) { } @@ -1031,7 +1031,7 @@ done: Eina_Bool evas_image_load_file_head_jpeg(Evas_Img_Load_Params *ilp, - const char *file, const char *key __UNUSED__, + const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; @@ -1064,7 +1064,7 @@ evas_image_load_file_head_jpeg(Evas_Img_Load_Params *ilp, static Eina_Bool evas_image_load_file_data_jpeg(Evas_Img_Load_Params *ilp, - const char *file, const char *key __UNUSED__, + const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; diff --git a/legacy/evas/src/bin/loaders/pmaps/evas_image_load_pmaps.c b/src/bin/evas/loaders/pmaps/evas_image_load_pmaps.c similarity index 99% rename from legacy/evas/src/bin/loaders/pmaps/evas_image_load_pmaps.c rename to src/bin/evas/loaders/pmaps/evas_image_load_pmaps.c index 20f740ee75..83b931001d 100644 --- a/legacy/evas/src/bin/loaders/pmaps/evas_image_load_pmaps.c +++ b/src/bin/evas/loaders/pmaps/evas_image_load_pmaps.c @@ -60,7 +60,7 @@ static size_t pmaps_buffer_raw_update(Pmaps_Buffer *b); static int pmaps_buffer_comment_skip(Pmaps_Buffer *b); static Eina_Bool -evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { Pmaps_Buffer b; @@ -85,7 +85,7 @@ evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, con } static Eina_Bool -evas_image_load_file_data_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { Pmaps_Buffer b; int pixels; diff --git a/legacy/evas/src/bin/loaders/png/evas_image_load_png.c b/src/bin/evas/loaders/png/evas_image_load_png.c similarity index 98% rename from legacy/evas/src/bin/loaders/png/evas_image_load_png.c rename to src/bin/evas/loaders/png/evas_image_load_png.c index 544fc6bad4..24e1ec2d57 100644 --- a/legacy/evas/src/bin/loaders/png/evas_image_load_png.c +++ b/src/bin/evas/loaders/png/evas_image_load_png.c @@ -29,7 +29,7 @@ static Eina_Bool -evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { png_uint_32 w32, h32; FILE *f; @@ -127,7 +127,7 @@ evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const } static Eina_Bool -evas_image_load_file_data_png(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_png(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { unsigned char *surface; png_uint_32 w32, h32; diff --git a/legacy/evas/src/bin/loaders/psd/evas_image_load_psd.c b/src/bin/evas/loaders/psd/evas_image_load_psd.c similarity index 99% rename from legacy/evas/src/bin/loaders/psd/evas_image_load_psd.c rename to src/bin/evas/loaders/psd/evas_image_load_psd.c index 30a31179f6..29f1c1975e 100644 --- a/legacy/evas/src/bin/loaders/psd/evas_image_load_psd.c +++ b/src/bin/evas/loaders/psd/evas_image_load_psd.c @@ -153,7 +153,7 @@ is_psd(PSD_Header *header) static Eina_Bool evas_image_load_file_head_psd(Evas_Img_Load_Params *ilp, const char *FileName, - const char *key __UNUSED__, int *error) + const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map; @@ -201,7 +201,7 @@ evas_image_load_file_head_psd(Evas_Img_Load_Params *ilp, const char *FileName, static unsigned int read_compressed_channel(const unsigned char *map, size_t length, size_t *position, - const unsigned int channel_length __UNUSED__, + const unsigned int channel_length EINA_UNUSED, unsigned int size, unsigned char* channel) { @@ -865,7 +865,7 @@ read_psd_cmyk(Evas_Img_Load_Params *ilp, PSD_Header *head, const unsigned char * static Eina_Bool evas_image_load_file_data_psd(Evas_Img_Load_Params *ilp, const char *file, - const char *key __UNUSED__, + const char *key EINA_UNUSED, int *error) { Eina_File *f; diff --git a/legacy/evas/src/bin/loaders/tga/evas_image_load_tga.c b/src/bin/evas/loaders/tga/evas_image_load_tga.c similarity index 99% rename from legacy/evas/src/bin/loaders/tga/evas_image_load_tga.c rename to src/bin/evas/loaders/tga/evas_image_load_tga.c index 4c7d5f1e60..b9dda06fc8 100644 --- a/legacy/evas/src/bin/loaders/tga/evas_image_load_tga.c +++ b/src/bin/evas/loaders/tga/evas_image_load_tga.c @@ -60,7 +60,7 @@ struct _tga_footer static Eina_Bool -evas_image_load_file_head_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; unsigned char *seg = NULL, *filedata; @@ -159,7 +159,7 @@ close_file: } static Eina_Bool -evas_image_load_file_data_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; unsigned char *seg = NULL, *filedata; diff --git a/legacy/evas/src/bin/loaders/tiff/evas_image_load_tiff.c b/src/bin/evas/loaders/tiff/evas_image_load_tiff.c similarity index 98% rename from legacy/evas/src/bin/loaders/tiff/evas_image_load_tiff.c rename to src/bin/evas/loaders/tiff/evas_image_load_tiff.c index e48e72f482..23e927dddd 100644 --- a/legacy/evas/src/bin/loaders/tiff/evas_image_load_tiff.c +++ b/src/bin/evas/loaders/tiff/evas_image_load_tiff.c @@ -26,7 +26,7 @@ struct TIFFRGBAImage_Extra { }; static Eina_Bool -evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { char txt[1024]; TIFFRGBAImage tiff_image; @@ -109,7 +109,7 @@ evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, cons } static Eina_Bool -evas_image_load_file_data_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { char txt[1024]; TIFFRGBAImage_Extra rgba_image; diff --git a/legacy/evas/src/bin/loaders/wbmp/evas_image_load_wbmp.c b/src/bin/evas/loaders/wbmp/evas_image_load_wbmp.c similarity index 97% rename from legacy/evas/src/bin/loaders/wbmp/evas_image_load_wbmp.c rename to src/bin/evas/loaders/wbmp/evas_image_load_wbmp.c index 6c34aa63d7..e8a41a0ee2 100644 --- a/legacy/evas/src/bin/loaders/wbmp/evas_image_load_wbmp.c +++ b/src/bin/evas/loaders/wbmp/evas_image_load_wbmp.c @@ -32,7 +32,7 @@ read_mb(unsigned int *data, void *map, size_t length, size_t *position) } static Eina_Bool -evas_image_load_file_head_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map = NULL; @@ -86,7 +86,7 @@ bail: } static Eina_Bool -evas_image_load_file_data_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map = NULL; diff --git a/legacy/evas/src/bin/loaders/webp/evas_image_load_webp.c b/src/bin/evas/loaders/webp/evas_image_load_webp.c similarity index 96% rename from legacy/evas/src/bin/loaders/webp/evas_image_load_webp.c rename to src/bin/evas/loaders/webp/evas_image_load_webp.c index 125c581548..c0c89d3f48 100644 --- a/legacy/evas/src/bin/loaders/webp/evas_image_load_webp.c +++ b/src/bin/evas/loaders/webp/evas_image_load_webp.c @@ -16,7 +16,7 @@ static Eina_Bool -evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { WebPDecoderConfig config; FILE *f; @@ -57,7 +57,7 @@ evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, cons } static Eina_Bool -evas_image_load_file_data_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error) { FILE *f; size_t file_size; diff --git a/legacy/evas/src/bin/loaders/xpm/evas_image_load_xpm.c b/src/bin/evas/loaders/xpm/evas_image_load_xpm.c similarity index 99% rename from legacy/evas/src/bin/loaders/xpm/evas_image_load_xpm.c rename to src/bin/evas/loaders/xpm/evas_image_load_xpm.c index 18eb1277aa..e8f52bb784 100644 --- a/legacy/evas/src/bin/loaders/xpm/evas_image_load_xpm.c +++ b/src/bin/evas/loaders/xpm/evas_image_load_xpm.c @@ -111,7 +111,7 @@ struct _CMap { }; Eina_Rbtree_Direction -_cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data __UNUSED__) +_cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data EINA_UNUSED) { CMap *lcm; CMap *rcm; @@ -125,7 +125,7 @@ _cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data } int -_cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length __UNUSED__, void *data __UNUSED__) +_cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length EINA_UNUSED, void *data EINA_UNUSED) { CMap *root = EINA_RBTREE_CONTAINER_GET(node, CMap); @@ -134,7 +134,7 @@ _cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length __UNUSED__ /** FIXME: clean this up and make more efficient **/ static Eina_Bool -evas_image_load_file_xpm(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int load_data, int *error) +evas_image_load_file_xpm(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int load_data, int *error) { DATA32 *ptr, *end; Eina_File *f; diff --git a/legacy/evas/src/lib/Evas.h b/src/lib/evas/Evas.h similarity index 100% rename from legacy/evas/src/lib/Evas.h rename to src/lib/evas/Evas.h diff --git a/legacy/evas/src/lib/Evas_GL.h b/src/lib/evas/Evas_GL.h similarity index 100% rename from legacy/evas/src/lib/Evas_GL.h rename to src/lib/evas/Evas_GL.h diff --git a/legacy/evas/src/lib/cache/evas_cache.h b/src/lib/evas/cache/evas_cache.h similarity index 100% rename from legacy/evas/src/lib/cache/evas_cache.h rename to src/lib/evas/cache/evas_cache.h diff --git a/legacy/evas/src/lib/cache/evas_cache_engine_image.c b/src/lib/evas/cache/evas_cache_engine_image.c similarity index 99% rename from legacy/evas/src/lib/cache/evas_cache_engine_image.c rename to src/lib/evas/cache/evas_cache_engine_image.c index 5ec1af2e04..a7a9905e9d 100644 --- a/legacy/evas/src/lib/cache/evas_cache_engine_image.c +++ b/src/lib/evas/cache/evas_cache_engine_image.c @@ -239,7 +239,7 @@ evas_cache_engine_image_dup(const Evas_Cache_Engine_Image_Func *cb, Evas_Cache_E } static Eina_Bool -_evas_cache_engine_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata) +_evas_cache_engine_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata) { Eina_List **delete_list = fdata; diff --git a/legacy/evas/src/lib/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c similarity index 98% rename from legacy/evas/src/lib/cache/evas_cache_image.c rename to src/lib/evas/cache/evas_cache_image.c index a8bafd764b..681e6af43e 100644 --- a/legacy/evas/src/lib/cache/evas_cache_image.c +++ b/src/lib/evas/cache/evas_cache_image.c @@ -490,7 +490,7 @@ evas_cache_image_init(const Evas_Cache_Image_Func *cb) } static Eina_Bool -_evas_cache_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata) +_evas_cache_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata) { Eina_List **delete_list = fdata; *delete_list = eina_list_prepend(*delete_list, data); @@ -1022,7 +1022,7 @@ evas_cache_image_unload_data(Image_Entry *im) } static Eina_Bool -_evas_cache_image_unload_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, __UNUSED__ void *fdata) +_evas_cache_image_unload_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, EINA_UNUSED void *fdata) { evas_cache_image_unload_data(data); return EINA_TRUE; @@ -1084,7 +1084,7 @@ _dump_img(Image_Entry *im, const char *type) } static Eina_Bool -_dump_cache_active(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata __UNUSED__) +_dump_cache_active(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata EINA_UNUSED) { Image_Entry *im = data; _dump_img(im, "ACTIVE"); diff --git a/legacy/evas/src/lib/cache/evas_preload.c b/src/lib/evas/cache/evas_preload.c similarity index 96% rename from legacy/evas/src/lib/cache/evas_preload.c rename to src/lib/evas/cache/evas_preload.c index a9c79f3d97..6be56eee23 100644 --- a/legacy/evas/src/lib/cache/evas_preload.c +++ b/src/lib/evas/cache/evas_preload.c @@ -51,7 +51,7 @@ _evas_preload_thread_end(void *data) } static void -_evas_preload_thread_done(void *target __UNUSED__, Evas_Callback_Type type __UNUSED__, void *event_info) +_evas_preload_thread_done(void *target EINA_UNUSED, Evas_Callback_Type type EINA_UNUSED, void *event_info) { Evas_Preload_Pthread_Worker *work = event_info; if (work->cancel) @@ -65,7 +65,7 @@ _evas_preload_thread_done(void *target __UNUSED__, Evas_Callback_Type type __UNU } static void * -_evas_preload_thread_worker(void *data, Eina_Thread thread __UNUSED__) +_evas_preload_thread_worker(void *data, Eina_Thread thread EINA_UNUSED) { Evas_Preload_Pthread_Data *pth = data; Evas_Preload_Pthread_Worker *work; diff --git a/legacy/evas/src/lib/cache2/evas_cache2.c b/src/lib/evas/cache2/evas_cache2.c similarity index 99% rename from legacy/evas/src/lib/cache2/evas_cache2.c rename to src/lib/evas/cache2/evas_cache2.c index 0a65fa0a5f..1b9d05cbd8 100644 --- a/legacy/evas/src/lib/cache2/evas_cache2.c +++ b/src/lib/evas/cache2/evas_cache2.c @@ -489,7 +489,7 @@ evas_cache2_init(const Evas_Cache2_Image_Func *cb) } static Eina_Bool -_evas_cache_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata) +_evas_cache_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata) { Eina_List **delete_list = fdata; *delete_list = eina_list_prepend(*delete_list, data); diff --git a/legacy/evas/src/lib/cache2/evas_cache2.h b/src/lib/evas/cache2/evas_cache2.h similarity index 100% rename from legacy/evas/src/lib/cache2/evas_cache2.h rename to src/lib/evas/cache2/evas_cache2.h diff --git a/legacy/evas/src/lib/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c similarity index 100% rename from legacy/evas/src/lib/canvas/common_interfaces.c rename to src/lib/evas/canvas/common_interfaces.c diff --git a/legacy/evas/src/lib/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_async_events.c rename to src/lib/evas/canvas/evas_async_events.c diff --git a/legacy/evas/src/lib/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_callbacks.c rename to src/lib/evas/canvas/evas_callbacks.c diff --git a/legacy/evas/src/lib/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_clip.c rename to src/lib/evas/canvas/evas_clip.c diff --git a/legacy/evas/src/lib/canvas/evas_common_interface.c b/src/lib/evas/canvas/evas_common_interface.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_common_interface.c rename to src/lib/evas/canvas/evas_common_interface.c diff --git a/legacy/evas/src/lib/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_data.c rename to src/lib/evas/canvas/evas_data.c diff --git a/legacy/evas/src/lib/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_device.c rename to src/lib/evas/canvas/evas_device.c diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_events.c rename to src/lib/evas/canvas/evas_events.c diff --git a/legacy/evas/src/lib/canvas/evas_filter.c b/src/lib/evas/canvas/evas_filter.c similarity index 97% rename from legacy/evas/src/lib/canvas/evas_filter.c rename to src/lib/evas/canvas/evas_filter.c index 953aea1c20..80a11b4313 100644 --- a/legacy/evas/src/lib/canvas/evas_filter.c +++ b/src/lib/evas/canvas/evas_filter.c @@ -475,31 +475,31 @@ evas_object_filter_param_int_get(Evas_Object *o, const char *param) } EAPI Eina_Bool -evas_object_filter_param_str_set(Evas_Object *o __UNUSED__, - const char *param __UNUSED__, - const char *val __UNUSED__) +evas_object_filter_param_str_set(Evas_Object *o EINA_UNUSED, + const char *param EINA_UNUSED, + const char *val EINA_UNUSED) { return EINA_FALSE; } EAPI const char * -evas_object_filter_param_str_get(Evas_Object *o __UNUSED__, - const char *param __UNUSED__) +evas_object_filter_param_str_get(Evas_Object *o EINA_UNUSED, + const char *param EINA_UNUSED) { return NULL; } EAPI Eina_Bool -evas_object_filter_param_obj_set(Evas_Object *o __UNUSED__, - const char *param __UNUSED__, - Evas_Object *val __UNUSED__) +evas_object_filter_param_obj_set(Evas_Object *o EINA_UNUSED, + const char *param EINA_UNUSED, + Evas_Object *val EINA_UNUSED) { return EINA_FALSE; } EAPI Evas_Object * -evas_object_filter_param_obj_get(Evas_Object *o __UNUSED__, - const char *param __UNUSED__) +evas_object_filter_param_obj_get(Evas_Object *o EINA_UNUSED, + const char *param EINA_UNUSED) { return NULL; } @@ -1241,7 +1241,7 @@ negation_filter(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst) } static Eina_Bool -sepia_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst) +sepia_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst) { uint32_t *in, *out; int i, j; @@ -1278,7 +1278,7 @@ sepia_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst } static Eina_Bool -greyscale_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst) +greyscale_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst) { uint32_t *in, *out; int i, j; @@ -1399,7 +1399,7 @@ brightness_filter(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst) } static Eina_Bool -contrast_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst) +contrast_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst) { uint32_t *in, *out; int i, j; diff --git a/legacy/evas/src/lib/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_focus.c rename to src/lib/evas/canvas/evas_focus.c diff --git a/legacy/evas/src/lib/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c similarity index 99% rename from legacy/evas/src/lib/canvas/evas_font_dir.c rename to src/lib/evas/canvas/evas_font_dir.c index 5a19a08fba..b35627aae3 100644 --- a/legacy/evas/src/lib/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -875,7 +875,7 @@ evas_font_dir_available_list_free(Eina_List *available) /* private stuff */ static Eina_Bool -font_cache_dir_free(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__) +font_cache_dir_free(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata EINA_UNUSED) { object_text_font_cache_dir_del((char *) key, data); return 1; @@ -1154,7 +1154,7 @@ object_text_font_cache_dir_add(char *dir) } static void -object_text_font_cache_dir_del(char *dir __UNUSED__, Evas_Font_Dir *fd) +object_text_font_cache_dir_del(char *dir EINA_UNUSED, Evas_Font_Dir *fd) { if (fd->lookup) eina_hash_free(fd->lookup); while (fd->fonts) diff --git a/legacy/evas/src/lib/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_gl.c rename to src/lib/evas/canvas/evas_gl.c diff --git a/legacy/evas/src/lib/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_key.c rename to src/lib/evas/canvas/evas_key.c diff --git a/legacy/evas/src/lib/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_key_grab.c rename to src/lib/evas/canvas/evas_key_grab.c diff --git a/legacy/evas/src/lib/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_layer.c rename to src/lib/evas/canvas/evas_layer.c diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_main.c rename to src/lib/evas/canvas/evas_main.c diff --git a/legacy/evas/src/lib/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_map.c rename to src/lib/evas/canvas/evas_map.c diff --git a/legacy/evas/src/lib/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_name.c rename to src/lib/evas/canvas/evas_name.c diff --git a/legacy/evas/src/lib/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c similarity index 99% rename from legacy/evas/src/lib/canvas/evas_object_box.c rename to src/lib/evas/canvas/evas_object_box.c index b486935451..2cc4597a61 100644 --- a/legacy/evas/src/lib/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -116,7 +116,7 @@ _evas_object_box_accessor_free(Evas_Object_Box_Accessor *it) } static void -_on_child_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *einfo __UNUSED__) +_on_child_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *einfo EINA_UNUSED) { Evas_Object *box = data; EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv); @@ -124,7 +124,7 @@ _on_child_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, v } static void -_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *o, void *einfo __UNUSED__) +_on_child_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *o, void *einfo EINA_UNUSED) { Evas_Object *box = data; @@ -136,7 +136,7 @@ _on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *o, void *einfo __U } static void -_on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *einfo __UNUSED__) +_on_child_hints_changed(void *data, Evas *evas EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *einfo EINA_UNUSED) { Evas_Object *box = data; EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv); @@ -147,7 +147,7 @@ _on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUS } static void -_on_hints_changed(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *o , void *einfo __UNUSED__) +_on_hints_changed(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *o , void *einfo EINA_UNUSED) { _sizing_eval(o); } diff --git a/legacy/evas/src/lib/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_grid.c rename to src/lib/evas/canvas/evas_object_grid.c diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c similarity index 99% rename from legacy/evas/src/lib/canvas/evas_object_image.c rename to src/lib/evas/canvas/evas_object_image.c index ad5dd46c79..f71f0e7ca1 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -1,10 +1,10 @@ #ifdef HAVE_CONFIG_H -# include "config.h" /* so that EAPI in Evas.h is correctly defined */ +# include "config.h" #endif +#include #include #include -#include #ifdef HAVE_SYS_MMAN_H # include #endif @@ -12,9 +12,9 @@ #include "evas_common.h" #include "evas_private.h" -#include "../engines/common/evas_convert_color.h" -#include "../engines/common/evas_convert_colorspace.h" -#include "../engines/common/evas_convert_yuv.h" +#include "../common/evas_convert_color.h" +#include "../common/evas_convert_colorspace.h" +#include "../common/evas_convert_yuv.h" #include @@ -4308,7 +4308,7 @@ evas_object_image_get_opaque_rect(Evas_Object *eo_obj, Evas_Object_Protected_Dat } static int -evas_object_image_can_map(Evas_Object *obj __UNUSED__) +evas_object_image_can_map(Evas_Object *obj EINA_UNUSED) { return 1; } @@ -4372,7 +4372,7 @@ evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_C } static void -evas_object_image_filled_resize_listener(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *einfo __UNUSED__) +evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *einfo EINA_UNUSED) { Evas_Coord w, h; diff --git a/legacy/evas/src/lib/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_inform.c rename to src/lib/evas/canvas/evas_object_inform.c diff --git a/legacy/evas/src/lib/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_intercept.c rename to src/lib/evas/canvas/evas_object_intercept.c diff --git a/legacy/evas/src/lib/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_line.c rename to src/lib/evas/canvas/evas_object_line.c diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_main.c rename to src/lib/evas/canvas/evas_object_main.c diff --git a/legacy/evas/src/lib/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_polygon.c rename to src/lib/evas/canvas/evas_object_polygon.c diff --git a/legacy/evas/src/lib/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_rectangle.c rename to src/lib/evas/canvas/evas_object_rectangle.c diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_smart.c rename to src/lib/evas/canvas/evas_object_smart.c diff --git a/legacy/evas/src/lib/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_object_smart_clipped.c rename to src/lib/evas/canvas/evas_object_smart_clipped.c diff --git a/legacy/evas/src/lib/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c similarity index 99% rename from legacy/evas/src/lib/canvas/evas_object_table.c rename to src/lib/evas/canvas/evas_object_table.c index da5550d847..6bf5c4728a 100644 --- a/legacy/evas/src/lib/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -246,14 +246,14 @@ _evas_object_table_option_del(Evas_Object *o) } static void -_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *child, void *einfo __UNUSED__) +_on_child_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *child, void *einfo EINA_UNUSED) { Evas_Object *table = data; evas_object_table_unpack(table, child); } static void -_on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__) +_on_child_hints_changed(void *data, Evas *evas EINA_UNUSED, Evas_Object *child EINA_UNUSED, void *einfo EINA_UNUSED) { Evas_Object *table = data; EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(table, priv); diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c similarity index 99% rename from legacy/evas/src/lib/canvas/evas_object_text.c rename to src/lib/evas/canvas/evas_object_text.c index 0279544448..b69798e17f 100644 --- a/legacy/evas/src/lib/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -261,7 +261,7 @@ _evas_object_text_horiz_advance_get(const Evas_Object *eo_obj, } static Evas_Coord -_evas_object_text_vert_advance_get(const Evas_Object *obj __UNUSED__, +_evas_object_text_vert_advance_get(const Evas_Object *obj EINA_UNUSED, const Evas_Object_Text *o) { return o->max_ascent + o->max_descent; diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c similarity index 99% rename from legacy/evas/src/lib/canvas/evas_object_textblock.c rename to src/lib/evas/canvas/evas_object_textblock.c index a9c0acc221..7246d41ec1 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -2088,7 +2088,7 @@ _layout_update_bidi_props(const Evas_Object_Textblock *o, * Free the visual lines in the paragraph (logical items are kept) */ static void -_paragraph_clear(const Evas_Object *obj __UNUSED__, +_paragraph_clear(const Evas_Object *obj EINA_UNUSED, Evas_Object_Textblock_Paragraph *par) { while (par->lines) @@ -2655,7 +2655,7 @@ _layout_line_advance(Ctxt *c, Evas_Object_Textblock_Format *fmt) * @param len the length of the string. */ static Evas_Object_Textblock_Text_Item * -_layout_text_item_new(Ctxt *c __UNUSED__, Evas_Object_Textblock_Format *fmt) +_layout_text_item_new(Ctxt *c EINA_UNUSED, Evas_Object_Textblock_Format *fmt) { Evas_Object_Textblock_Text_Item *ti; @@ -3142,7 +3142,7 @@ _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) * @param create_item Create a new format item if true, only process otherwise. */ static void -_layout_do_format(const Evas_Object *obj __UNUSED__, Ctxt *c, +_layout_do_format(const Evas_Object *obj EINA_UNUSED, Ctxt *c, Evas_Object_Textblock_Format **_fmt, Evas_Object_Textblock_Node_Format *n, int *style_pad_l, int *style_pad_r, int *style_pad_t, int *style_pad_b, Eina_Bool create_item) diff --git a/legacy/evas/src/lib/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c similarity index 99% rename from legacy/evas/src/lib/canvas/evas_object_textgrid.c rename to src/lib/evas/canvas/evas_object_textgrid.c index 9ba96ed443..c5a651b503 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -878,7 +878,7 @@ evas_object_textgrid_engine_data_get(Evas_Object *eo_obj) } static int -evas_object_textgrid_is_opaque(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj EINA_UNUSED) +evas_object_textgrid_is_opaque(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED) { /* this returns 1 if the internal object data implies that the object is currently fully opaque over the entire gradient it occupies */ @@ -886,7 +886,7 @@ evas_object_textgrid_is_opaque(Evas_Object *eo_obj __UNUSED__, Evas_Object_Prote } static int -evas_object_textgrid_was_opaque(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj EINA_UNUSED) +evas_object_textgrid_was_opaque(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED) { /* this returns 1 if the internal object data implies that the object was currently fully opaque over the entire gradient it occupies */ diff --git a/legacy/evas/src/lib/canvas/evas_rectangle.c b/src/lib/evas/canvas/evas_rectangle.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_rectangle.c rename to src/lib/evas/canvas/evas_rectangle.c diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_render.c rename to src/lib/evas/canvas/evas_render.c diff --git a/legacy/evas/src/lib/canvas/evas_smart.c b/src/lib/evas/canvas/evas_smart.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_smart.c rename to src/lib/evas/canvas/evas_smart.c diff --git a/legacy/evas/src/lib/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_stack.c rename to src/lib/evas/canvas/evas_stack.c diff --git a/legacy/evas/src/lib/canvas/evas_stats.c b/src/lib/evas/canvas/evas_stats.c similarity index 69% rename from legacy/evas/src/lib/canvas/evas_stats.c rename to src/lib/evas/canvas/evas_stats.c index 3e057d06f0..ba6f8ac4de 100644 --- a/legacy/evas/src/lib/canvas/evas_stats.c +++ b/src/lib/evas/canvas/evas_stats.c @@ -15,30 +15,30 @@ evas_cserve_connected_get(void) } EAPI Eina_Bool -evas_cserve_stats_get(Evas_Cserve_Stats *stats __UNUSED__) +evas_cserve_stats_get(Evas_Cserve_Stats *stats EINA_UNUSED) { return 0; } EAPI Eina_Bool -evas_cserve_image_cache_contents_get(Evas_Cserve_Image_Cache *cache __UNUSED__) +evas_cserve_image_cache_contents_get(Evas_Cserve_Image_Cache *cache EINA_UNUSED) { return 0; } EAPI void -evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache __UNUSED__) +evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache EINA_UNUSED) { } EAPI Eina_Bool -evas_cserve_config_get(Evas_Cserve_Config *config __UNUSED__) +evas_cserve_config_get(Evas_Cserve_Config *config EINA_UNUSED) { return 0; } EAPI Eina_Bool -evas_cserve_config_set(const Evas_Cserve_Config *config __UNUSED__) +evas_cserve_config_set(const Evas_Cserve_Config *config EINA_UNUSED) { return 0; } diff --git a/legacy/evas/src/lib/canvas/evas_touch_point.c b/src/lib/evas/canvas/evas_touch_point.c similarity index 100% rename from legacy/evas/src/lib/canvas/evas_touch_point.c rename to src/lib/evas/canvas/evas_touch_point.c diff --git a/legacy/evas/src/lib/engines/common/evas_blend.h b/src/lib/evas/common/evas_blend.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_blend.h rename to src/lib/evas/common/evas_blend.h diff --git a/legacy/evas/src/lib/engines/common/evas_blend_main.c b/src/lib/evas/common/evas_blend_main.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_blend_main.c rename to src/lib/evas/common/evas_blend_main.c index dcc0f4c94e..d37d888769 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_main.c +++ b/src/lib/evas/common/evas_blend_main.c @@ -9,12 +9,12 @@ const DATA32 ALPHA_255 = 255; const DATA32 ALPHA_256 = 256; static void -_composite_span_nothing(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d __UNUSED__, int l __UNUSED__) +_composite_span_nothing(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d EINA_UNUSED, int l EINA_UNUSED) { } static void -_composite_pt_nothing(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d __UNUSED__) +_composite_pt_nothing(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d EINA_UNUSED) { } diff --git a/legacy/evas/src/lib/engines/common/evas_blend_private.h b/src/lib/evas/common/evas_blend_private.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_blend_private.h rename to src/lib/evas/common/evas_blend_private.h diff --git a/legacy/evas/src/lib/engines/common/evas_blit_main.c b/src/lib/evas/common/evas_blit_main.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_blit_main.c rename to src/lib/evas/common/evas_blit_main.c diff --git a/legacy/evas/src/lib/engines/common/evas_convert_color.c b/src/lib/evas/common/evas_convert_color.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_color.c rename to src/lib/evas/common/evas_convert_color.c diff --git a/legacy/evas/src/lib/engines/common/evas_convert_color.h b/src/lib/evas/common/evas_convert_color.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_color.h rename to src/lib/evas/common/evas_convert_color.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.c b/src/lib/evas/common/evas_convert_colorspace.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_convert_colorspace.c rename to src/lib/evas/common/evas_convert_colorspace.c index 013c2e7896..49b066c1c2 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.c +++ b/src/lib/evas/common/evas_convert_colorspace.c @@ -13,7 +13,7 @@ static inline void * -evas_common_convert_argb8888_to_rgb565_a5p(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__, int stride __UNUSED__, Eina_Bool has_alpha __UNUSED__) +evas_common_convert_argb8888_to_rgb565_a5p(void *data EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int stride EINA_UNUSED, Eina_Bool has_alpha EINA_UNUSED) { return NULL; } diff --git a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.h b/src/lib/evas/common/evas_convert_colorspace.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_colorspace.h rename to src/lib/evas/common/evas_convert_colorspace.h diff --git a/src/lib/evas/common/evas_convert_gry_1.c b/src/lib/evas/common/evas_convert_gry_1.c new file mode 100644 index 0000000000..df12ea6fa7 --- /dev/null +++ b/src/lib/evas/common/evas_convert_gry_1.c @@ -0,0 +1,6 @@ +#include "evas_common.h" +#include "evas_convert_gry_1.h" + +void evas_common_convert_rgba_to_1bpp_gry_1_dith(DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) +{ +} diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_1.h b/src/lib/evas/common/evas_convert_gry_1.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_gry_1.h rename to src/lib/evas/common/evas_convert_gry_1.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c b/src/lib/evas/common/evas_convert_gry_8.c similarity index 68% rename from legacy/evas/src/lib/engines/common/evas_convert_gry_8.c rename to src/lib/evas/common/evas_convert_gry_8.c index bf45fd7a41..072a7dc720 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c +++ b/src/lib/evas/common/evas_convert_gry_8.c @@ -8,7 +8,7 @@ extern const DATA8 _evas_dither_44[4][4]; extern const DATA8 _evas_dither_128128[128][128]; #endif -void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -32,9 +32,9 @@ void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -void evas_common_convert_rgba_to_8bpp_gry_64_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){} +void evas_common_convert_rgba_to_8bpp_gry_64_dith (DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED){} -void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal __UNUSED__) +void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -63,6 +63,6 @@ void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -void evas_common_convert_rgba_to_8bpp_gry_4_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){} +void evas_common_convert_rgba_to_8bpp_gry_4_dith (DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED){} -void evas_common_convert_rgba_to_8bpp_gry_1_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){} +void evas_common_convert_rgba_to_8bpp_gry_1_dith (DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED){} diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.h b/src/lib/evas/common/evas_convert_gry_8.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_gry_8.h rename to src/lib/evas/common/evas_convert_gry_8.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c b/src/lib/evas/common/evas_convert_grypal_6.c similarity index 79% rename from legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c rename to src/lib/evas/common/evas_convert_grypal_6.c index c2acef7d04..243bf000e6 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c +++ b/src/lib/evas/common/evas_convert_grypal_6.c @@ -1,7 +1,7 @@ #include "evas_common.h" #include "evas_convert_grypal_6.h" -void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.h b/src/lib/evas/common/evas_convert_grypal_6.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_grypal_6.h rename to src/lib/evas/common/evas_convert_grypal_6.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_main.c b/src/lib/evas/common/evas_convert_main.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_convert_main.c rename to src/lib/evas/common/evas_convert_main.c index 39e6d6c06a..2be2aa27eb 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_main.c +++ b/src/lib/evas/common/evas_convert_main.c @@ -157,7 +157,7 @@ evas_common_convert_init(void) } EAPI Gfx_Func_Convert -evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation) +evas_common_convert_func_get(DATA8 *dest, int w, int h EINA_UNUSED, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation) { if ((rmask == 0) && (gmask == 0) && (bmask == 0)) { diff --git a/legacy/evas/src/lib/engines/common/evas_convert_main.h b/src/lib/evas/common/evas_convert_main.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_main.h rename to src/lib/evas/common/evas_convert_main.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c b/src/lib/evas/common/evas_convert_rgb_16.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c rename to src/lib/evas/common/evas_convert_rgb_16.c diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.h b/src/lib/evas/common/evas_convert_rgb_16.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_rgb_16.h rename to src/lib/evas/common/evas_convert_rgb_16.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c b/src/lib/evas/common/evas_convert_rgb_24.c similarity index 82% rename from legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c rename to src/lib/evas/common/evas_convert_rgb_24.c index 1d4f091c22..88f3648039 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c +++ b/src/lib/evas/common/evas_convert_rgb_24.c @@ -2,7 +2,7 @@ #include "evas_convert_rgb_24.h" void -evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -28,7 +28,7 @@ evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump, } void -evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA8 *dst_ptr, *scratch_ptr; @@ -59,7 +59,7 @@ evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, } void -evas_common_convert_rgba_to_24bpp_bgr_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_24bpp_bgr_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA8 *dst_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.h b/src/lib/evas/common/evas_convert_rgb_24.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_rgb_24.h rename to src/lib/evas/common/evas_convert_rgb_24.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c b/src/lib/evas/common/evas_convert_rgb_32.c similarity index 92% rename from legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c rename to src/lib/evas/common/evas_convert_rgb_32.c index 17d686b587..b7652269c0 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c +++ b/src/lib/evas/common/evas_convert_rgb_32.c @@ -2,7 +2,7 @@ #include "evas_convert_rgb_32.h" void -evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -24,7 +24,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jum } void -evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -189,7 +189,7 @@ FAST_SIMPLE_ROTATE(8888, DATA32) #endif void -evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { #ifdef TILE_ROTATE blt_rotated_270_8888((DATA8 *)dst, dst_jump+w, (const DATA8 *)src, src_jump+h, w, h) ; @@ -210,7 +210,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int } void -evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { # ifndef BUILD_NEON # ifdef TILE_ROTATE @@ -328,7 +328,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int } void -evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -346,7 +346,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_ju } void -evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -364,7 +364,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, in } void -evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -382,7 +382,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, in } void -evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -400,7 +400,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int } void -evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -417,7 +417,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jum } void -evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -434,7 +434,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int } void -evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -451,7 +451,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int } void -evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -468,7 +468,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int } void -evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -485,7 +485,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_ju } void -evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -502,7 +502,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, in } void -evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -519,7 +519,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, in } void -evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -536,7 +536,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int } void -evas_common_convert_rgba_to_32bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) +evas_common_convert_rgba_to_32bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) { DATA32 *src_ptr; DATA32 *dst_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.h b/src/lib/evas/common/evas_convert_rgb_32.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_rgb_32.h rename to src/lib/evas/common/evas_convert_rgb_32.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c b/src/lib/evas/common/evas_convert_rgb_8.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c rename to src/lib/evas/common/evas_convert_rgb_8.c diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.h b/src/lib/evas/common/evas_convert_rgb_8.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_rgb_8.h rename to src/lib/evas/common/evas_convert_rgb_8.h diff --git a/legacy/evas/src/lib/engines/common/evas_convert_yuv.c b/src/lib/evas/common/evas_convert_yuv.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_yuv.c rename to src/lib/evas/common/evas_convert_yuv.c diff --git a/legacy/evas/src/lib/engines/common/evas_convert_yuv.h b/src/lib/evas/common/evas_convert_yuv.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_convert_yuv.h rename to src/lib/evas/common/evas_convert_yuv.h diff --git a/legacy/evas/src/lib/engines/common/evas_cpu.c b/src/lib/evas/common/evas_cpu.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_cpu.c rename to src/lib/evas/common/evas_cpu.c index 33229ff1a1..040589e866 100644 --- a/legacy/evas/src/lib/engines/common/evas_cpu.c +++ b/src/lib/evas/common/evas_cpu.c @@ -21,13 +21,13 @@ static void evas_common_cpu_catch_ill(int sig); static void evas_common_cpu_catch_segv(int sig); static void -evas_common_cpu_catch_ill(int sig __UNUSED__) +evas_common_cpu_catch_ill(int sig EINA_UNUSED) { siglongjmp(detect_buf, 1); } static void -evas_common_cpu_catch_segv(int sig __UNUSED__) +evas_common_cpu_catch_segv(int sig EINA_UNUSED) { siglongjmp(detect_buf, 1); } diff --git a/legacy/evas/src/lib/engines/common/evas_draw.h b/src/lib/evas/common/evas_draw.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_draw.h rename to src/lib/evas/common/evas_draw.h diff --git a/legacy/evas/src/lib/engines/common/evas_draw_main.c b/src/lib/evas/common/evas_draw_main.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_draw_main.c rename to src/lib/evas/common/evas_draw_main.c diff --git a/legacy/evas/src/lib/engines/common/evas_font.h b/src/lib/evas/common/evas_font.h similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_font.h rename to src/lib/evas/common/evas_font.h index 5c7c1afcd3..6517aa7f87 100644 --- a/legacy/evas/src/lib/engines/common/evas_font.h +++ b/src/lib/evas/common/evas_font.h @@ -9,7 +9,7 @@ EAPI void evas_common_font_init (void); EAPI void evas_common_font_shutdown (void); EAPI void evas_common_font_font_all_unload (void); - + EAPI int evas_common_font_ascent_get (RGBA_Font *fn); EAPI int evas_common_font_descent_get (RGBA_Font *fn); EAPI int evas_common_font_max_ascent_get (RGBA_Font *fn); @@ -63,8 +63,8 @@ EAPI void evas_common_font_all_clear (void); EAPI int evas_common_font_query_kerning (RGBA_Font_Int* fi, FT_UInt left, FT_UInt right, int* kerning); EAPI void evas_common_font_query_size (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *w, int *h); -EAPI int evas_common_font_query_inset (RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props); -EAPI int evas_common_font_query_right_inset (RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props); +EAPI int evas_common_font_query_inset (RGBA_Font *fn, const Evas_Text_Props *text_props); +EAPI int evas_common_font_query_right_inset (RGBA_Font *fn, const Evas_Text_Props *text_props); EAPI void evas_common_font_query_advance (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *h_adv, int *v_adv); EAPI int evas_common_font_query_char_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch); EAPI int evas_common_font_query_pen_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch); diff --git a/legacy/evas/src/lib/engines/common/evas_font_default_walk.x b/src/lib/evas/common/evas_font_default_walk.x similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_font_default_walk.x rename to src/lib/evas/common/evas_font_default_walk.x diff --git a/legacy/evas/src/lib/engines/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_font_draw.c rename to src/lib/evas/common/evas_font_draw.c index 6f0b6e7aa2..0c760e6174 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_draw.c +++ b/src/lib/evas/common/evas_font_draw.c @@ -30,7 +30,7 @@ evas_common_font_draw_init(void) static void evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, const Evas_Text_Props *text_props, RGBA_Gfx_Func func, int ext_x, int ext_y, int ext_w, - int ext_h, int im_w, int im_h __UNUSED__) + int ext_h, int im_w, int im_h EINA_UNUSED) { DATA32 *im; Evas_Glyph *glyphs; diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_font_load.c rename to src/lib/evas/common/evas_font_load.c index 3e0cf1cc13..f3be326fe3 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_load.c +++ b/src/lib/evas/common/evas_font_load.c @@ -1,18 +1,22 @@ -#include "evas_common.h" -#include "evas_private.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include +#ifdef USE_HARFBUZZ +# include +# include +#endif + +#include "evas_common.h" +#include "evas_private.h" + #include "evas_font_private.h" /* for Frame-Queuing support */ #include "evas_font_ot.h" #ifdef EVAS_CSERVE2 -# include "../../cserve2/evas_cs2_private.h" -#endif - -#ifdef USE_HARFBUZZ -# include -# include +# include "../cserve2/evas_cs2_private.h" #endif extern FT_Library evas_ft_lib; @@ -30,8 +34,8 @@ static int fonts_use_usage = 0; static void _evas_common_font_int_clear(RGBA_Font_Int *fi); static int -_evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length __UNUSED__, - const RGBA_Font_Int *k2, int k2_length __UNUSED__) +_evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length EINA_UNUSED, + const RGBA_Font_Int *k2, int k2_length EINA_UNUSED) { /* RGBA_Font_Source->name is a stringshare */ if (k1->src->name == k2->src->name) @@ -45,7 +49,7 @@ _evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length __UNUSED__, } static int -_evas_font_cache_int_hash(const RGBA_Font_Int *key, int key_length __UNUSED__) +_evas_font_cache_int_hash(const RGBA_Font_Int *key, int key_length EINA_UNUSED) { int hash; unsigned int wanted_rend = key->wanted_rend; @@ -283,8 +287,8 @@ evas_common_font_size_use(RGBA_Font *fn) } static int -_evas_common_font_double_int_cmp(const int *key1, __UNUSED__ int key1_length, - const int *key2, __UNUSED__ int key2_length) +_evas_common_font_double_int_cmp(const int *key1, EINA_UNUSED int key1_length, + const int *key2, EINA_UNUSED int key2_length) { if (key1[0] - key2[0] == 0) return key1[1] - key2[1]; return key1[0] - key2[0]; @@ -758,7 +762,7 @@ _evas_common_font_int_clear(RGBA_Font_Int *fi) } static Eina_Bool -_evas_common_font_all_clear_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_evas_common_font_all_clear_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { RGBA_Font_Int *fi = data; _evas_common_font_int_clear(fi); diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_font_main.c rename to src/lib/evas/common/evas_font_main.c index d577d43ad3..401bb1b52b 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_main.c +++ b/src/lib/evas/common/evas_font_main.c @@ -1,14 +1,18 @@ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + #include "evas_common.h" #include "evas_private.h" #include "evas_font_private.h" #ifdef EVAS_CSERVE2 -# include "../../cserve2/evas_cs2_private.h" +# include "../cserve2/evas_cs2_private.h" #endif -#include - #include FT_OUTLINE_H #include FT_SYNTHESIS_H diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot.c b/src/lib/evas/common/evas_font_ot.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_font_ot.c rename to src/lib/evas/common/evas_font_ot.c diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot.h b/src/lib/evas/common/evas_font_ot.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_font_ot.h rename to src/lib/evas/common/evas_font_ot.h diff --git a/legacy/evas/src/lib/engines/common/evas_font_private.h b/src/lib/evas/common/evas_font_private.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_font_private.h rename to src/lib/evas/common/evas_font_private.h diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_font_query.c rename to src/lib/evas/common/evas_font_query.c index ddd6a5c919..32182bd963 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_query.c +++ b/src/lib/evas/common/evas_font_query.c @@ -234,7 +234,7 @@ evas_common_font_query_kerning(RGBA_Font_Int *fi, FT_UInt left, FT_UInt right, * @return the calculated inset. */ EAPI int -evas_common_font_query_inset(RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props) +evas_common_font_query_inset(RGBA_Font *fn EINA_UNUSED, const Evas_Text_Props *text_props) { if (!text_props->len) return 0; return text_props->info->glyph[text_props->start].x_bear; @@ -253,7 +253,7 @@ evas_common_font_query_inset(RGBA_Font *fn __UNUSED__, const Evas_Text_Props *te * @see evas_common_font_query_inset() */ EAPI int -evas_common_font_query_right_inset(RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props) +evas_common_font_query_right_inset(RGBA_Font *fn EINA_UNUSED, const Evas_Text_Props *text_props) { const Evas_Font_Glyph_Info *gli; if (!text_props->len) return 0; diff --git a/legacy/evas/src/lib/engines/common/evas_image.h b/src/lib/evas/common/evas_image.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_image.h rename to src/lib/evas/common/evas_image.h diff --git a/legacy/evas/src/lib/engines/common/evas_image_data.c b/src/lib/evas/common/evas_image_data.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_image_data.c rename to src/lib/evas/common/evas_image_data.c index ca09d1e8cc..25cf3d70c6 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_data.c +++ b/src/lib/evas/common/evas_image_data.c @@ -77,7 +77,7 @@ evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, DATA3 } int -evas_common_rgba_image_size_set(Image_Entry *ie_dst, const Image_Entry *ie_im, unsigned int w, unsigned int h __UNUSED__) +evas_common_rgba_image_size_set(Image_Entry *ie_dst, const Image_Entry *ie_im, unsigned int w, unsigned int h EINA_UNUSED) { RGBA_Image *dst = (RGBA_Image *) ie_dst; RGBA_Image *im = (RGBA_Image *) ie_im; diff --git a/legacy/evas/src/lib/engines/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_image_load.c rename to src/lib/evas/common/evas_image_load.c index 0c39495f8a..3bea0f5662 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_load.c +++ b/src/lib/evas/common/evas_image_load.c @@ -139,7 +139,7 @@ struct evas_image_foreach_loader_data static Eina_Bool -_evas_image_foreach_loader(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_evas_image_foreach_loader(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { Evas_Image_Load_Func *evas_image_load_func = NULL; Evas_Module *em = data; diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_image_main.c rename to src/lib/evas/common/evas_image_main.c index 62e6a361bd..a8f7317e39 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_main.c +++ b/src/lib/evas/common/evas_image_main.c @@ -467,7 +467,7 @@ _evas_common_rgba_image_unload(Image_Entry *im) } static void -_evas_common_rgba_image_dirty_region(Image_Entry* ie, unsigned int x __UNUSED__, unsigned int y __UNUSED__, unsigned int w __UNUSED__, unsigned int h __UNUSED__) +_evas_common_rgba_image_dirty_region(Image_Entry* ie, unsigned int x EINA_UNUSED, unsigned int y EINA_UNUSED, unsigned int w EINA_UNUSED, unsigned int h EINA_UNUSED) { RGBA_Image *im = (RGBA_Image *) ie; diff --git a/legacy/evas/src/lib/engines/common/evas_image_private.h b/src/lib/evas/common/evas_image_private.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_image_private.h rename to src/lib/evas/common/evas_image_private.h diff --git a/legacy/evas/src/lib/engines/common/evas_image_save.c b/src/lib/evas/common/evas_image_save.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_image_save.c rename to src/lib/evas/common/evas_image_save.c diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_image_scalecache.c rename to src/lib/evas/common/evas_image_scalecache.c index 5a2d7a25a3..606509a721 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c +++ b/src/lib/evas/common/evas_image_scalecache.c @@ -199,7 +199,7 @@ _sci_fix_newest(RGBA_Image *im) static Scaleitem * _sci_find(RGBA_Image *im, - RGBA_Draw_Context *dc __UNUSED__, int smooth, + RGBA_Draw_Context *dc EINA_UNUSED, int smooth, int src_region_x, int src_region_y, unsigned int src_region_w, unsigned int src_region_h, unsigned int dst_region_w, unsigned int dst_region_h) @@ -364,11 +364,11 @@ evas_common_rgba_image_scalecache_flush(void) } EAPI void -evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNUSED__, +evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_UNUSED, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, - int dst_region_x __UNUSED__, int dst_region_y __UNUSED__, + int dst_region_x EINA_UNUSED, int dst_region_y EINA_UNUSED, int dst_region_w, int dst_region_h) { #ifdef SCALECACHE diff --git a/legacy/evas/src/lib/engines/common/evas_line.h b/src/lib/evas/common/evas_line.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_line.h rename to src/lib/evas/common/evas_line.h diff --git a/legacy/evas/src/lib/engines/common/evas_line_main.c b/src/lib/evas/common/evas_line_main.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_line_main.c rename to src/lib/evas/common/evas_line_main.c diff --git a/legacy/evas/src/lib/engines/common/evas_map_image.c b/src/lib/evas/common/evas_map_image.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_map_image.c rename to src/lib/evas/common/evas_map_image.c index bc2d5a139a..1f68f8a1dc 100644 --- a/legacy/evas/src/lib/engines/common/evas_map_image.c +++ b/src/lib/evas/common/evas_map_image.c @@ -82,7 +82,7 @@ _limit(Span *s, int c1, int c2, int nocol) // 12.63 % of time - this can improve static void -_calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy __UNUSED__, int cw, int ch __UNUSED__) +_calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy EINA_UNUSED, int cw, int ch EINA_UNUSED) { int i, y, yp, yy; int py[4]; @@ -648,7 +648,7 @@ evas_common_map_rgba_prepare(RGBA_Image *src, RGBA_Image *dst, EAPI void evas_common_map_rgba(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, - int npoints __UNUSED__, RGBA_Map_Point *p, + int npoints EINA_UNUSED, RGBA_Map_Point *p, int smooth, int level) { #ifdef BUILD_MMX diff --git a/legacy/evas/src/lib/engines/common/evas_map_image.h b/src/lib/evas/common/evas_map_image.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_map_image.h rename to src/lib/evas/common/evas_map_image.h diff --git a/legacy/evas/src/lib/engines/common/evas_map_image_core.c b/src/lib/evas/common/evas_map_image_core.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_map_image_core.c rename to src/lib/evas/common/evas_map_image_core.c diff --git a/legacy/evas/src/lib/engines/common/evas_map_image_internal.c b/src/lib/evas/common/evas_map_image_internal.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_map_image_internal.c rename to src/lib/evas/common/evas_map_image_internal.c index 8f4660f1f3..dba252b592 100644 --- a/legacy/evas/src/lib/engines/common/evas_map_image_internal.c +++ b/src/lib/evas/common/evas_map_image_internal.c @@ -3,7 +3,7 @@ static void FUNC_NAME(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Map_Point *p, - int smooth, int level __UNUSED__) // level unused for now - for future use + int smooth, int level EINA_UNUSED) // level unused for now - for future use { int i; int c, cx, cy, cw, ch; @@ -118,7 +118,7 @@ static void FUNC_NAME_DO(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, const RGBA_Map_Spans *ms, - int smooth, int level __UNUSED__) // level unused for now - for future use + int smooth, int level EINA_UNUSED) // level unused for now - for future use { Line *spans; DATA32 *buf = NULL, *sp; diff --git a/legacy/evas/src/lib/engines/common/evas_map_image_loop.c b/src/lib/evas/common/evas_map_image_loop.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_map_image_loop.c rename to src/lib/evas/common/evas_map_image_loop.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_.c b/src/lib/evas/common/evas_op_add/op_add_color_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_.c rename to src/lib/evas/common/evas_op_add/op_add_color_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_i386.c b/src/lib/evas/common/evas_op_add/op_add_color_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_i386.c rename to src/lib/evas/common/evas_op_add/op_add_color_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_.c b/src/lib/evas/common/evas_op_add/op_add_mask_color_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_.c rename to src/lib/evas/common/evas_op_add/op_add_mask_color_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_i386.c b/src/lib/evas/common/evas_op_add/op_add_mask_color_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_i386.c rename to src/lib/evas/common/evas_op_add/op_add_mask_color_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_.c b/src/lib/evas/common/evas_op_add/op_add_pixel_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_.c rename to src/lib/evas/common/evas_op_add/op_add_pixel_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_.c b/src/lib/evas/common/evas_op_add/op_add_pixel_color_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_.c rename to src/lib/evas/common/evas_op_add/op_add_pixel_color_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_i386.c b/src/lib/evas/common/evas_op_add/op_add_pixel_color_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_i386.c rename to src/lib/evas/common/evas_op_add/op_add_pixel_color_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_i386.c b/src/lib/evas/common/evas_op_add/op_add_pixel_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_i386.c rename to src/lib/evas/common/evas_op_add/op_add_pixel_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_.c b/src/lib/evas/common/evas_op_add/op_add_pixel_mask_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_.c rename to src/lib/evas/common/evas_op_add/op_add_pixel_mask_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_i386.c b/src/lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_i386.c rename to src/lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_add_main_.c b/src/lib/evas/common/evas_op_add_main_.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_op_add_main_.c rename to src/lib/evas/common/evas_op_add_main_.c index 9decc42140..bde553c458 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_add_main_.c +++ b/src/lib/evas/common/evas_op_add_main_.c @@ -138,7 +138,7 @@ add_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_add_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_add_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -150,7 +150,7 @@ op_add_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_add_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_add_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -166,7 +166,7 @@ op_add_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_add_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_add_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -184,7 +184,7 @@ op_add_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi } static RGBA_Gfx_Func -op_add_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_add_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN; @@ -200,7 +200,7 @@ op_add_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_add_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_add_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN; @@ -362,7 +362,7 @@ add_rel_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_add_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_add_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -374,7 +374,7 @@ op_add_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED_ } static RGBA_Gfx_Func -op_add_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_add_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -390,7 +390,7 @@ op_add_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_add_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_add_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -408,7 +408,7 @@ op_add_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, in } static RGBA_Gfx_Func -op_add_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_add_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN; @@ -424,7 +424,7 @@ op_add_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED_ } static RGBA_Gfx_Func -op_add_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_add_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN; diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_.c b/src/lib/evas/common/evas_op_blend/op_blend_color_.c similarity index 89% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_.c rename to src/lib/evas/common/evas_op_blend/op_blend_color_.c index 277dced663..d92f0cb1d1 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_color_.c @@ -1,7 +1,7 @@ /* blend color -> dst */ static void -_op_blend_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e, a = 256 - (c >> 24); UNROLL8_PLD_WHILE(d, l, e, { @@ -26,7 +26,7 @@ init_blend_color_span_funcs_c(void) } static void -_op_blend_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_pt_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = 256 - (c >> 24); *d = c + MUL_256(s, *d); } @@ -54,7 +54,7 @@ init_blend_color_pt_funcs_c(void) /* blend_rel color -> dst */ static void -_op_blend_rel_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha = 256 - (c >> 24); UNROLL8_PLD_WHILE(d, l, e, @@ -80,7 +80,7 @@ init_blend_rel_color_span_funcs_c(void) } static void -_op_blend_rel_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_rel_pt_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = *d >> 24; *d = MUL_SYM(s, c) + MUL_256(256 - (c >> 24), *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_color_i386.c similarity index 90% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_i386.c rename to src/lib/evas/common/evas_op_blend/op_blend_color_i386.c index a05af7db40..ae9888ffad 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_i386.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_blend_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) @@ -35,7 +35,7 @@ init_blend_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_blend_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) c = 256 - (c >> 24); @@ -67,7 +67,7 @@ init_blend_color_pt_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_blend_rel_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) @@ -103,7 +103,7 @@ init_blend_rel_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_blend_rel_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_rel_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) MOV_A2R(ALPHA_255, mm5) diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_color_neon.c similarity index 93% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_neon.c rename to src/lib/evas/common/evas_op_blend/op_blend_color_neon.c index 53b99913c6..8512bb4444 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_neon.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_color_neon.c @@ -2,7 +2,7 @@ #ifdef BUILD_NEON static void -_op_blend_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e, *tmp = 0; #define AP "B_C_DP" asm volatile ( @@ -147,7 +147,7 @@ init_blend_color_span_funcs_neon(void) #ifdef BUILD_NEON static void -_op_blend_pt_c_dp_neon(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_pt_c_dp_neon(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = 256 - (c >> 24); *d = c + MUL_256(s, *d); } @@ -173,7 +173,7 @@ init_blend_color_pt_funcs_neon(void) #ifdef BUILD_NEON static void -_op_blend_rel_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha = 256 - (c >> 24); UNROLL8_PLD_WHILE(d, l, e, @@ -201,7 +201,7 @@ init_blend_rel_color_span_funcs_neon(void) #ifdef BUILD_NEON static void -_op_blend_rel_pt_c_dp_neon(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_rel_pt_c_dp_neon(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = *d >> 24; *d = MUL_SYM(s, c) + MUL_256(256 - (c >> 24), *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_sse3.c rename to src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c index 1843265fc9..02321b5bd8 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c @@ -3,7 +3,7 @@ #ifdef BUILD_SSE3 static void -_op_blend_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 a = 256 - (c >> 24); @@ -87,7 +87,7 @@ init_blend_color_pt_funcs_sse3(void) /* blend_rel color -> dst */ static void -_op_blend_rel_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { int alpha = 256 - (c >> 24); diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_.c similarity index 95% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c rename to src/lib/evas/common/evas_op_blend/op_blend_mask_color_.c index 715f8d9dab..f0b6ef7582 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_.c @@ -1,7 +1,7 @@ /* blend mask x color -> dst */ static void -_op_blend_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha = 256 - (c >> 24); UNROLL8_PLD_WHILE(d, l, e, @@ -27,7 +27,7 @@ _op_blend_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_mas_can_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_mas_can_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -79,7 +79,7 @@ _op_blend_pt_mas_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) { } static void -_op_blend_pt_mas_can_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) { +_op_blend_pt_mas_can_dp(DATA32 s EINA_UNUSED, DATA8 m, DATA32 c, DATA32 *d) { *d = INTERP_256(m + 1, c, *d); } @@ -110,7 +110,7 @@ init_blend_mask_color_pt_funcs_c(void) /* blend_rel mask x color --> dst */ static void -_op_blend_rel_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_i386.c rename to src/lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c index f8fe02e871..0031a91194 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_i386.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_blend_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) @@ -42,7 +42,7 @@ _op_blend_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int } static void -_op_blend_mas_can_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_mas_can_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) @@ -143,7 +143,7 @@ init_blend_mask_color_pt_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_blend_rel_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c rename to src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c index f5eb480cdc..da7cd3e24d 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c @@ -18,7 +18,7 @@ #ifdef BUILD_NEON static void -_op_blend_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e; DEBUG_FNCOUNT(""); @@ -198,7 +198,7 @@ _op_blend_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int #ifdef BUILD_NEON static void -_op_blend_mas_can_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_mas_can_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e,*tmp; int alpha; @@ -489,7 +489,7 @@ init_blend_mask_color_pt_funcs_neon(void) #ifdef BUILD_NEON static void -_op_blend_rel_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_sse3.c rename to src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c index 5883d15ec4..429e8d5ce0 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c @@ -3,7 +3,7 @@ #ifdef BUILD_SSE3 static void -_op_blend_mas_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_mas_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { const __m128i c_packed = _mm_set_epi32(c, c, c, c); @@ -69,7 +69,7 @@ _op_blend_mas_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int } static void -_op_blend_mas_can_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_mas_can_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 alpha; @@ -211,7 +211,7 @@ init_blend_mask_color_pt_funcs_sse3(void) /* blend_rel mask x color --> dst */ static void -_op_blend_rel_mas_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_mas_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { const __m128i c_packed = _mm_set_epi32(c, c, c, c); diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_master_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_master_sse3.c rename to src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_.c similarity index 88% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_.c index ba11296eb1..b1d1196134 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_.c @@ -1,7 +1,7 @@ /* blend pixel --> dst */ static void -_op_blend_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -13,7 +13,7 @@ _op_blend_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, i } static void -_op_blend_pas_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pas_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -53,7 +53,7 @@ init_blend_pixel_span_funcs_c(void) } static void -_op_blend_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { c = 256 - (s >> 24); *d = s + MUL_256(c, *d); } @@ -82,7 +82,7 @@ init_blend_pixel_pt_funcs_c(void) /* blend_rel pixel -> dst */ static void -_op_blend_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -96,7 +96,7 @@ _op_blend_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_rel_pan_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_pan_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, { @@ -125,13 +125,13 @@ init_blend_rel_pixel_span_funcs_c(void) } static void -_op_blend_rel_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_rel_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { c = 256 - (s >> 24); *d = MUL_SYM(*d >> 24, s) + MUL_256(c, *d); } static void -_op_blend_rel_pt_pan_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_blend_rel_pt_pan_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { *d = MUL_SYM(*d >> 24, s); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_.c similarity index 94% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_color_.c index db8837f43f..8d6e944def 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_.c @@ -1,7 +1,7 @@ /* blend pixel x color --> dst */ static void -_op_blend_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -15,7 +15,7 @@ _op_blend_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_pan_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha = 256 - (c >> 24); UNROLL8_PLD_WHILE(d, l, e, @@ -27,7 +27,7 @@ _op_blend_pan_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_p_can_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_p_can_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -40,7 +40,7 @@ _op_blend_p_can_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_pan_can_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_can_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, { @@ -50,7 +50,7 @@ _op_blend_pan_can_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) } static void -_op_blend_p_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_p_caa_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; c = 1 + (c & 0xff); @@ -65,7 +65,7 @@ _op_blend_p_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_pan_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_caa_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; c = 1 + (c & 0xff); UNROLL8_PLD_WHILE(d, l, e, @@ -115,7 +115,7 @@ init_blend_pixel_color_span_funcs_c(void) } static void -_op_blend_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = MUL4_SYM(c, s); c = 256 - (s >> 24); *d = s + MUL_256(c, *d); @@ -169,7 +169,7 @@ init_blend_pixel_color_pt_funcs_c(void) /* blend_rel pixel x color -> dst */ static void -_op_blend_rel_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -226,7 +226,7 @@ init_blend_rel_pixel_color_span_funcs_c(void) } static void -_op_blend_rel_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_rel_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = MUL4_SYM(c, s); c = 256 - (s >> 24); *d = MUL_SYM(*d >> 24, s) + MUL_256(c, *d); diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_i386.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c index 52751f4841..7cb97ae318 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_i386.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_blend_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_p_c_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; MOV_A2R(ALPHA_256, mm6) MOV_A2R(ALPHA_255, mm5) @@ -26,7 +26,7 @@ _op_blend_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) } static void -_op_blend_pan_can_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_can_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) @@ -40,7 +40,7 @@ _op_blend_pan_can_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, in } static void -_op_blend_pan_caa_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_caa_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; c = 1 + (c & 0xff); MOV_A2R(c, mm2) @@ -100,7 +100,7 @@ init_blend_pixel_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_blend_pt_p_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_pt_p_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { MOV_A2R(ALPHA_256, mm4) MOV_A2R(ALPHA_255, mm5) pxor_r2r(mm0, mm0); diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_neon.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c index 6e359704aa..765f55878e 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_neon.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c @@ -3,7 +3,7 @@ /* Note: Optimisation is based on keeping _dest_ aligned: else it's a pair of * reads, then two writes, a miss on read is 'just' two reads */ static void -_op_blend_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_p_c_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { #define AP "blend_p_c_dp_" asm volatile ( ".fpu neon \n\t" @@ -189,7 +189,7 @@ _op_blend_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l } static void -_op_blend_pan_can_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_can_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, { @@ -199,7 +199,7 @@ _op_blend_pan_can_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, i } static void -_op_blend_pan_caa_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_caa_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { #if 1 DATA32 *e; int alpha; @@ -461,7 +461,7 @@ init_blend_pixel_color_span_funcs_neon(void) #ifdef BUILD_NEON static void -_op_blend_pt_p_c_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_blend_pt_p_c_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = MUL4_SYM(c, s); c = 256 - (s >> 24); *d = s + MUL_256(c, *d); diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_sse3.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c index 4ee31f54c2..b0c2b84f8e 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c @@ -3,7 +3,7 @@ #ifdef BUILD_SSE3 static void -_op_blend_p_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_p_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 alpha; @@ -60,7 +60,7 @@ _op_blend_p_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l } static void -_op_blend_pan_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 c_a = c & 0xFF000000; DATA32 alpha = 256 - (c >> 24); @@ -114,7 +114,7 @@ _op_blend_pan_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int } static void -_op_blend_p_can_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_p_can_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { int alpha; const __m128i c_packed = _mm_set_epi32(c, c, c, c); @@ -169,7 +169,7 @@ _op_blend_p_can_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int } static void -_op_blend_pan_can_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_can_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { const __m128i c_packed = _mm_set_epi32(c, c, c, c); @@ -209,7 +209,7 @@ _op_blend_pan_can_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, i } static void -_op_blend_p_caa_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_p_caa_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { int alpha; c = 1 + (c & 0xff); @@ -263,7 +263,7 @@ _op_blend_p_caa_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int } static void -_op_blend_pan_caa_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_pan_caa_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { c = 1 + (c & 0xff); const __m128i c_packed = _mm_set_epi32(c, c, c,c); @@ -391,7 +391,7 @@ init_blend_pixel_color_pt_funcs_sse3(void) /* blend_rel pixel x color -> dst */ static void -_op_blend_rel_p_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_p_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { int alpha; diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c similarity index 90% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c index 9b5abe6f4f..a4333a89f7 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_blend_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) @@ -23,7 +23,7 @@ _op_blend_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 * } static void -_op_blend_pas_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pas_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { _op_blend_p_dp_mmx(s, m, c, d, l); return; DATA32 *e = d + l; @@ -76,7 +76,7 @@ init_blend_pixel_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_blend_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_blend_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) MOV_P2R(s, mm2, mm0) @@ -118,7 +118,7 @@ init_blend_pixel_pt_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_blend_rel_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_rel_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) @@ -142,7 +142,7 @@ _op_blend_rel_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA } static void -_op_blend_rel_pan_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_rel_pan_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) @@ -178,7 +178,7 @@ init_blend_rel_pixel_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_blend_rel_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_blend_rel_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) MOV_A2R(ALPHA_255, mm5) diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c index f0b2a6c247..5d6c976860 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c @@ -26,7 +26,7 @@ _op_blend_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_pas_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pas_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -49,7 +49,7 @@ _op_blend_pas_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) } static void -_op_blend_pan_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pan_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -96,7 +96,7 @@ _op_blend_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) { } static void -_op_blend_pt_pan_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) { +_op_blend_pt_pan_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) { *d = INTERP_256(m + 1, s, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c similarity index 95% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_i386.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c index 4fa50a964d..8c960d2117 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_i386.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_blend_pas_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pas_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_256, mm6) @@ -37,7 +37,7 @@ _op_blend_pas_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, in } static void -_op_blend_pan_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pan_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; MOV_A2R(ALPHA_255, mm5) pxor_r2r(mm0, mm0); diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_neon.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c index b252a6752c..d36e714721 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_neon.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c @@ -2,7 +2,7 @@ #ifdef BUILD_NEON static void -_op_blend_pas_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pas_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, @@ -25,7 +25,7 @@ _op_blend_pas_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, i } static void -_op_blend_pan_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pan_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_sse3.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c index 617b9e2588..e33831f19a 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c @@ -62,7 +62,7 @@ _op_blend_p_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_pas_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pas_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { const __m128i ones = _mm_set_epi32(1, 1, 1, 1); int alpha; diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_neon.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_sse3.c rename to src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c index 69c597c44f..2601853ce4 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c @@ -3,7 +3,7 @@ #ifdef BUILD_SSE3 static void -_op_blend_p_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_p_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { LOOP_ALIGNED_U1_A48_SSE3(d, l, { /* UOP */ @@ -50,7 +50,7 @@ _op_blend_p_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 } static void -_op_blend_pas_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_blend_pas_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { int alpha; @@ -178,7 +178,7 @@ init_blend_pixel_pt_funcs_sse3(void) /* blend_rel pixel -> dst */ static void -_op_blend_rel_p_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_p_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { const __m128i ones = _mm_set_epi32(1, 1, 1, 1); @@ -229,7 +229,7 @@ _op_blend_rel_p_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int } static void -_op_blend_rel_pan_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_blend_rel_pan_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { const __m128i ones = _mm_set_epi32(1, 1, 1, 1); diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend_main_.c b/src/lib/evas/common/evas_op_blend_main_.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_op_blend_main_.c rename to src/lib/evas/common/evas_op_blend_main_.c index 1642036995..b3aaf90a20 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend_main_.c +++ b/src/lib/evas/common/evas_op_blend_main_.c @@ -183,7 +183,7 @@ blend_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_blend_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -199,7 +199,7 @@ op_blend_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_blend_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -215,7 +215,7 @@ op_blend_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_blend_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -237,7 +237,7 @@ op_blend_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int } static RGBA_Gfx_Func -op_blend_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN; @@ -253,7 +253,7 @@ op_blend_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_blend_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN; @@ -468,7 +468,7 @@ blend_rel_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_blend_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -484,7 +484,7 @@ op_blend_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSE } static RGBA_Gfx_Func -op_blend_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -500,7 +500,7 @@ op_blend_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_blend_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -518,7 +518,7 @@ op_blend_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, } static RGBA_Gfx_Func -op_blend_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN; @@ -534,7 +534,7 @@ op_blend_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSE } static RGBA_Gfx_Func -op_blend_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_blend_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN; diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_.c b/src/lib/evas/common/evas_op_copy/op_copy_color_.c similarity index 92% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_.c rename to src/lib/evas/common/evas_op_copy/op_copy_color_.c index 99591b22aa..3dc5582f6e 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_color_.c @@ -1,7 +1,7 @@ /* copy color --> dst */ static void -_op_copy_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, { @@ -34,7 +34,7 @@ init_copy_color_span_funcs_c(void) } static void -_op_copy_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_pt_c_dp(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { *d = c; } @@ -66,7 +66,7 @@ init_copy_color_pt_funcs_c(void) /* copy_rel color --> dst */ static void -_op_copy_rel_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_rel_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, { @@ -100,7 +100,7 @@ init_copy_rel_color_span_funcs_c(void) } static void -_op_copy_rel_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_rel_pt_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = 1 + (*d >> 24); *d = MUL_256(s, c); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_color_i386.c similarity index 93% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_i386.c rename to src/lib/evas/common/evas_op_copy/op_copy_color_i386.c index d864d924d8..d526491c89 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_i386.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_copy_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l - 1; movd_m2r(c, mm1); movq_r2r(mm1, mm2); @@ -43,7 +43,7 @@ init_copy_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { *d = c; } @@ -77,7 +77,7 @@ init_copy_color_pt_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_rel_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_rel_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) @@ -115,7 +115,7 @@ init_copy_rel_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_rel_pt_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_rel_pt_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = 1 + (*d >> 24); pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_color_neon.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_neon.c rename to src/lib/evas/common/evas_op_copy/op_copy_color_neon.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_.c b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_.c rename to src/lib/evas/common/evas_op_copy/op_copy_mask_color_.c index 16faa28221..efe7cca358 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_.c @@ -1,7 +1,7 @@ /* copy mask x color -> dst */ static void -_op_copy_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_copy_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e; int color; UNROLL8_PLD_WHILE(d, l, e, @@ -47,7 +47,7 @@ init_copy_mask_color_span_funcs_c(void) } static void -_op_copy_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) { +_op_copy_pt_mas_c_dp(DATA32 s EINA_UNUSED, DATA8 m, DATA32 c, DATA32 *d) { *d = INTERP_256(m + 1, c, *d); } @@ -80,7 +80,7 @@ init_copy_mask_color_pt_funcs_c(void) /* copy_rel mask x color -> dst */ static void -_op_copy_rel_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_copy_rel_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e; int color; UNROLL8_PLD_WHILE(d, l, e, diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_i386.c rename to src/lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c index e27493f82a..a8c85e0f7f 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_i386.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_copy_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_copy_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) @@ -98,7 +98,7 @@ init_copy_mask_color_pt_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_rel_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_copy_rel_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_neon.c rename to src/lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c index dc7f78f26f..7d9a44e4b6 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_neon.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c @@ -2,7 +2,7 @@ #ifdef BUILD_NEON static void -_op_copy_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_copy_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { // FIXME: neon-it DATA32 *e; int color; @@ -85,7 +85,7 @@ init_copy_mask_color_pt_funcs_neon(void) #ifdef BUILD_NEON static void -_op_copy_rel_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_copy_rel_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { // FIXME: neon-it DATA32 *e; int color; diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_.c similarity index 90% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_.c index 2936d43a1e..e3cc111d87 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_.c @@ -1,7 +1,7 @@ /* copy pixel --> dst */ static void -_op_copy_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { memcpy(d, s, l * sizeof(DATA32)); } @@ -25,7 +25,7 @@ init_copy_pixel_span_funcs_c(void) } static void -_op_copy_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_copy_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { *d = s; } @@ -53,7 +53,7 @@ init_copy_pixel_pt_funcs_c(void) /* copy_rel pixel --> dst */ static void -_op_copy_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_rel_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, { @@ -83,7 +83,7 @@ init_copy_rel_pixel_span_funcs_c(void) } static void -_op_copy_rel_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_rel_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { c = 1 + (*d >> 24); *d = MUL_256(c, s); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_.c similarity index 95% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_color_.c index 79ca17b794..0b1f8e7ca4 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_.c @@ -1,7 +1,7 @@ /* copy pixel x color --> dst */ static void -_op_copy_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, { @@ -12,7 +12,7 @@ _op_copy_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { } static void -_op_copy_p_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_p_caa_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; c = 1 + (c >> 24); UNROLL8_PLD_WHILE(d, l, e, @@ -67,12 +67,12 @@ init_copy_pixel_color_span_funcs_c(void) } static void -_op_copy_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { *d = MUL4_SYM(c, s); } static void -_op_copy_pt_p_caa_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_pt_p_caa_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { *d = MUL_SYM(c >> 24, s); } @@ -124,7 +124,7 @@ init_copy_pixel_color_pt_funcs_c(void) /* copy_rel pixel x color --> dst */ static void -_op_copy_rel_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_rel_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, { @@ -179,7 +179,7 @@ init_copy_rel_pixel_color_span_funcs_c(void) } static void -_op_copy_rel_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_rel_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = MUL4_SYM(c, s); *d = MUL_SYM(*d >> 24, s); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_i386.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c index fb5bc70783..e50e818e16 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_i386.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_copy_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_p_c_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm3, mm0) @@ -17,7 +17,7 @@ _op_copy_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) static void -_op_copy_p_caa_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_p_caa_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; c = 1 + (c >> 24); MOV_A2R(c, mm3) @@ -76,7 +76,7 @@ init_copy_pixel_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_pt_p_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_pt_p_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_255, mm5) MOV_P2R(c, mm2, mm0) @@ -135,7 +135,7 @@ init_copy_pixel_color_pt_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_rel_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_rel_p_c_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_P2R(c, mm3, mm0) @@ -197,7 +197,7 @@ init_copy_rel_pixel_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_rel_pt_p_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_rel_pt_p_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { pxor_r2r(mm0, mm0); MOV_P2R(c, mm3, mm0) MOV_A2R(ALPHA_255, mm5) diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_neon.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c index f8a1e79cf1..cccfe441e0 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_neon.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c @@ -2,7 +2,7 @@ #ifdef BUILD_NEON static void -_op_copy_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_p_c_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { // FIXME: neon-it DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, @@ -15,7 +15,7 @@ _op_copy_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) static void -_op_copy_p_caa_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { // FIXME: neon-it +_op_copy_p_caa_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { // FIXME: neon-it // FIXME: neon-it DATA32 *e; c = 1 + (c >> 24); @@ -73,7 +73,7 @@ init_copy_pixel_color_span_funcs_neon(void) #ifdef BUILD_NEON static void -_op_copy_pt_p_c_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_pt_p_c_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { *d = MUL4_SYM(c, s); } @@ -127,7 +127,7 @@ init_copy_pixel_color_pt_funcs_neon(void) #ifdef BUILD_NEON static void -_op_copy_rel_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_copy_rel_p_c_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { // FIXME: neon-it DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, @@ -186,7 +186,7 @@ init_copy_rel_pixel_color_span_funcs_neon(void) #ifdef BUILD_NEON static void -_op_copy_rel_pt_p_c_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_rel_pt_p_c_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = MUL4_SYM(c, s); *d = MUL_SYM(*d >> 24, s); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_i386.c similarity index 91% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_i386.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_i386.c index b03022b967..1659a09285 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_i386.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_copy_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l - 15; for (; d < e; d+=16, s+=16) { MOVE_16DWORDS_MMX(s, d); @@ -35,7 +35,7 @@ init_copy_pixel_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_copy_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { *d = s; } @@ -65,7 +65,7 @@ init_copy_pixel_pt_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_rel_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_rel_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_255, mm5) @@ -100,7 +100,7 @@ init_copy_rel_pixel_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_rel_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_rel_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { c = 1 + (*d >> 24); MOV_A2R(c, mm1) pxor_r2r(mm0, mm0); diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c index 4cec8af405..5a861b2590 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c @@ -1,7 +1,7 @@ /* copy pixel x mask --> dst */ static void -_op_copy_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e; int color; UNROLL8_PLD_WHILE(d, l, e, @@ -44,7 +44,7 @@ init_copy_pixel_mask_span_funcs_c(void) } static void -_op_copy_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) { +_op_copy_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) { *d = INTERP_256(m + 1, s, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_i386.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c index 2511c41fad..d70162b975 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_i386.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_copy_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_255, mm5) @@ -87,7 +87,7 @@ init_copy_pixel_mask_pt_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_copy_rel_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_rel_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_255, mm5) diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_neon.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c index e25f8f8db2..993e5af8ca 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_neon.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c @@ -2,7 +2,7 @@ #ifdef BUILD_NEON static void -_op_copy_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { // FIXME: neon-it DATA32 *e; int color; @@ -77,7 +77,7 @@ init_copy_pixel_mask_pt_funcs_neon(void) #ifdef BUILD_NEON static void -_op_copy_rel_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_rel_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { // FIXME: neon-it DATA32 *e; int color; diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c similarity index 93% rename from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_neon.c rename to src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c index 5b8bd60381..244b585940 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_neon.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c @@ -2,7 +2,7 @@ #ifdef BUILD_NEON static void -_op_copy_p_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_p_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { //#define USENEON 1 #ifndef USENEON memcpy(d, s, l * sizeof(DATA32)); @@ -68,7 +68,7 @@ init_copy_pixel_span_funcs_neon(void) #ifdef BUILD_NEON static void -_op_copy_pt_p_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_copy_pt_p_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { *d = s; } @@ -98,7 +98,7 @@ init_copy_pixel_pt_funcs_neon(void) #ifdef BUILD_NEON static void -_op_copy_rel_p_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_copy_rel_p_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { // FIXME: neon-it DATA32 *e; UNROLL8_PLD_WHILE(d, l, e, @@ -131,7 +131,7 @@ init_copy_rel_pixel_span_funcs_neon(void) #ifdef BUILD_NEON static void -_op_copy_rel_pt_p_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_copy_rel_pt_p_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = 1 + (*d >> 24); *d = MUL_256(s, c); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy_main_.c b/src/lib/evas/common/evas_op_copy_main_.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_op_copy_main_.c rename to src/lib/evas/common/evas_op_copy_main_.c index 43b7e342bf..9debe171b2 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_copy_main_.c +++ b/src/lib/evas/common/evas_op_copy_main_.c @@ -172,7 +172,7 @@ copy_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_copy_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -187,7 +187,7 @@ op_copy_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_copy_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -207,7 +207,7 @@ op_copy_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_copy_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -233,7 +233,7 @@ op_copy_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int p } static RGBA_Gfx_Func -op_copy_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP; @@ -249,7 +249,7 @@ op_copy_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_copy_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP; @@ -454,7 +454,7 @@ copy_rel_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_copy_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -470,7 +470,7 @@ op_copy_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED } static RGBA_Gfx_Func -op_copy_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -490,7 +490,7 @@ op_copy_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_copy_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -516,7 +516,7 @@ op_copy_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, i } static RGBA_Gfx_Func -op_copy_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP; @@ -532,7 +532,7 @@ op_copy_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED } static RGBA_Gfx_Func -op_copy_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_copy_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP; diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_.c b/src/lib/evas/common/evas_op_mask/op_mask_color_.c similarity index 86% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_.c rename to src/lib/evas/common/evas_op_mask/op_mask_color_.c index c957315687..d3401dd9d3 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_.c +++ b/src/lib/evas/common/evas_op_mask/op_mask_color_.c @@ -1,7 +1,7 @@ /* mask color --> dst */ static void -_op_mask_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mask_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; c = 1 + (c >> 24); for (; d < e; d++) { @@ -25,7 +25,7 @@ init_mask_color_span_funcs_c(void) } static void -_op_mask_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_mask_pt_c_dp(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { *d = MUL_SYM(c >> 24, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_color_i386.c similarity index 88% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_i386.c rename to src/lib/evas/common/evas_op_mask/op_mask_color_i386.c index 9635eac993..4c182fb671 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_i386.c +++ b/src/lib/evas/common/evas_op_mask/op_mask_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_mask_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mask_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; c = 1 + (c >> 24); MOV_A2R(c, mm2) @@ -32,7 +32,7 @@ init_mask_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_mask_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_mask_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { c = 1 + (c >> 24); MOV_A2R(c, mm2) pxor_r2r(mm0, mm0); diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_.c b/src/lib/evas/common/evas_op_mask/op_mask_mask_color_.c similarity index 90% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_.c rename to src/lib/evas/common/evas_op_mask/op_mask_mask_color_.c index dacd23ab84..939c1baf46 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_.c +++ b/src/lib/evas/common/evas_op_mask/op_mask_mask_color_.c @@ -1,7 +1,7 @@ /* mask mask x color -> dst */ static void -_op_mask_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_mask_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; c = 1 + (c >> 24); while (d < e) { @@ -38,7 +38,7 @@ init_mask_mask_color_span_funcs_c(void) } static void -_op_mask_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) { +_op_mask_pt_mas_c_dp(DATA32 s EINA_UNUSED, DATA8 m, DATA32 c, DATA32 *d) { c = 256 - (((256 - (c >> 24)) * m) >> 8); *d = MUL_256(c, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_i386.c rename to src/lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_.c similarity index 86% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_.c rename to src/lib/evas/common/evas_op_mask/op_mask_pixel_.c index 822e74b208..dfccb57e95 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_.c +++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_.c @@ -1,7 +1,7 @@ /* mask pixel --> dst */ static void -_op_mask_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_mask_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; for (; d < e; d++, s++) { *d = MUL_SYM(*s >> 24, *d); @@ -24,7 +24,7 @@ init_mask_pixel_span_funcs_c(void) } static void -_op_mask_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_mask_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { *d = MUL_SYM(s >> 24, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_color_.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_.c rename to src/lib/evas/common/evas_op_mask/op_mask_pixel_color_.c index d236671b7f..aa726b41a7 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_.c +++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_color_.c @@ -1,7 +1,7 @@ /* mask pixel x color --> dst */ static void -_op_mask_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mask_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; l = 1 + (c >> 24); while (d < e) { @@ -51,7 +51,7 @@ init_mask_pixel_color_span_funcs_c(void) } static void -_op_mask_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_mask_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { c = 1 + ((((c >> 24) * (s >> 24)) + 255) >> 8); *d = MUL_256(c, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_i386.c rename to src/lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_i386.c similarity index 89% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_i386.c rename to src/lib/evas/common/evas_op_mask/op_mask_pixel_i386.c index a1c09af62a..366abb03f7 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_i386.c +++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_mask_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_mask_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; MOV_A2R(ALPHA_255, mm5) pxor_r2r(mm0, mm0); @@ -32,7 +32,7 @@ init_mask_pixel_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_mask_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_mask_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { MOV_A2R(ALPHA_255, mm5) pxor_r2r(mm0, mm0); MOV_P2R(*d, mm1, mm0) diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c similarity index 90% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_.c rename to src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c index 5a5c4f0a26..c6f08a98e5 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_.c +++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c @@ -1,7 +1,7 @@ /* mask pixel x mask --> dst */ static void -_op_mask_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_mask_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; while (d < e) { l = *m; @@ -37,7 +37,7 @@ init_mask_pixel_mask_span_funcs_c(void) } static void -_op_mask_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) { +_op_mask_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) { s = 256 - (((256 - (s >> 24)) * m) >> 8); *d = MUL_256(s, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_i386.c rename to src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask_main_.c b/src/lib/evas/common/evas_op_mask_main_.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_op_mask_main_.c rename to src/lib/evas/common/evas_op_mask_main_.c index 221a59df93..4ed41d6db3 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mask_main_.c +++ b/src/lib/evas/common/evas_op_mask_main_.c @@ -106,7 +106,7 @@ mask_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_mask_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_mask_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -121,7 +121,7 @@ op_mask_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -141,7 +141,7 @@ op_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_mask_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_mask_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -167,7 +167,7 @@ op_mask_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int p } static RGBA_Gfx_Func -op_mask_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_mask_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP; @@ -183,7 +183,7 @@ op_mask_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_mask_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_mask_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP; diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_.c b/src/lib/evas/common/evas_op_mul/op_mul_color_.c similarity index 87% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_.c rename to src/lib/evas/common/evas_op_mul/op_mul_color_.c index 7e16c6ce8d..8649f24857 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_color_.c @@ -1,7 +1,7 @@ /* mul color --> dst */ static void -_op_mul_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mul_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; for (; d < e; d++) { *d = MUL4_SYM(c, *d); @@ -9,7 +9,7 @@ _op_mul_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int } static void -_op_mul_caa_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mul_caa_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; c = 1 + (c >> 24); for (; d < e; d++) { @@ -36,7 +36,7 @@ init_mul_color_span_funcs_c(void) } static void -_op_mul_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_mul_pt_c_dp(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { *d = MUL4_SYM(c, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_color_i386.c similarity index 91% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_i386.c rename to src/lib/evas/common/evas_op_mul/op_mul_color_i386.c index 95f43f6bd2..fa4f282804 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_i386.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_mul_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mul_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_255, mm5) @@ -36,7 +36,7 @@ init_mul_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_mul_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_mul_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_255, mm5) MOV_P2R(c, mm2, mm0) diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_.c b/src/lib/evas/common/evas_op_mul/op_mul_mask_color_.c similarity index 92% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_.c rename to src/lib/evas/common/evas_op_mul/op_mul_mask_color_.c index 2840e6f781..9c9a64188a 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_mask_color_.c @@ -1,7 +1,7 @@ /* mul mask x color -> dst */ static void -_op_mul_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_mul_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l, nc = ~c; while (d < e) { @@ -42,7 +42,7 @@ init_mul_mask_color_span_funcs_c(void) } static void -_op_mul_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) { +_op_mul_pt_mas_c_dp(DATA32 s EINA_UNUSED, DATA8 m, DATA32 c, DATA32 *d) { c = ~c; c = ~MUL_SYM(m, c); *d = MUL4_SYM(c, *d); diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_i386.c rename to src/lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c index 1999503af2..2f53a6aee5 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_i386.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_mul_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_mul_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; MOV_P2R(c, mm2, mm0) c = ~c; diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_.c similarity index 89% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_.c rename to src/lib/evas/common/evas_op_mul/op_mul_pixel_.c index 78ca8345d3..8531a91992 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_.c @@ -1,7 +1,7 @@ /* mul pixel --> dst */ static void -_op_mul_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_mul_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = d + l; for (; d < e; d++, s++) { *d = MUL4_SYM(*s, *d); @@ -28,7 +28,7 @@ init_mul_pixel_span_funcs_c(void) } static void -_op_mul_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_mul_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { *d = MUL4_SYM(s, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_color_.c similarity index 93% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_.c rename to src/lib/evas/common/evas_op_mul/op_mul_pixel_color_.c index 40fbc709fc..50a6aa4570 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_color_.c @@ -1,7 +1,7 @@ /* mul pixel x color --> dst */ static void -_op_mul_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mul_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; while (d < e) { DATA32 cs = MUL4_SYM(c, *s); @@ -11,7 +11,7 @@ _op_mul_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { } static void -_op_mul_p_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mul_p_caa_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; c = 1 + (c >> 24); while (d < e) @@ -65,13 +65,13 @@ init_mul_pixel_color_span_funcs_c(void) } static void -_op_mul_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_mul_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = MUL4_SYM(c, s); *d = MUL4_SYM(s, *d); } static void -_op_mul_pt_p_caa_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_mul_pt_p_caa_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { s = MUL_SYM(c >> 24, s); *d = MUL4_SYM(s, *d); } diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_i386.c rename to src/lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c index 24f5a80f49..fd21a24c7e 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_i386.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_mul_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { +_op_mul_p_c_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { DATA32 *e = d + l; MOV_A2R(ALPHA_255, mm5) pxor_r2r(mm0, mm0); @@ -64,7 +64,7 @@ init_mul_pixel_color_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_mul_pt_p_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) { +_op_mul_pt_p_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { MOV_A2R(ALPHA_255, mm5) pxor_r2r(mm0, mm0); MOV_P2R(c, mm2, mm0) diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_i386.c similarity index 91% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_i386.c rename to src/lib/evas/common/evas_op_mul/op_mul_pixel_i386.c index 0db6cd75f0..cacb52409e 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_i386.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_i386.c @@ -2,7 +2,7 @@ #ifdef BUILD_MMX static void -_op_mul_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) { +_op_mul_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { DATA32 *e = s + l; pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_255, mm5) @@ -36,7 +36,7 @@ init_mul_pixel_span_funcs_mmx(void) #ifdef BUILD_MMX static void -_op_mul_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) { +_op_mul_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) { pxor_r2r(mm0, mm0); MOV_A2R(ALPHA_255, mm5) MOV_P2R(*d, mm1, mm0) diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_.c rename to src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c index bd500e732e..29ec6da279 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_.c +++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c @@ -87,7 +87,7 @@ init_mul_pixel_mask_span_funcs_c(void) } static void -_op_mul_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) { +_op_mul_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) { s = ~s; s = ~MUL_SYM(m, s); *d = MUL4_SYM(s, *d); diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_i386.c rename to src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul_main_.c b/src/lib/evas/common/evas_op_mul_main_.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_op_mul_main_.c rename to src/lib/evas/common/evas_op_mul_main_.c index d809009765..26604d7230 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_mul_main_.c +++ b/src/lib/evas/common/evas_op_mul_main_.c @@ -105,7 +105,7 @@ mul_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_mul_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_mul_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -120,7 +120,7 @@ op_mul_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_mul_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_mul_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -140,7 +140,7 @@ op_mul_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_mul_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_mul_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -166,7 +166,7 @@ op_mul_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi } static RGBA_Gfx_Func -op_mul_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_mul_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP; @@ -182,7 +182,7 @@ op_mul_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_mul_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_mul_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP; diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_.c b/src/lib/evas/common/evas_op_sub/op_sub_color_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_.c rename to src/lib/evas/common/evas_op_sub/op_sub_color_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_color_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_i386.c rename to src/lib/evas/common/evas_op_sub/op_sub_color_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_.c b/src/lib/evas/common/evas_op_sub/op_sub_mask_color_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_.c rename to src/lib/evas/common/evas_op_sub/op_sub_mask_color_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_i386.c rename to src/lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_.c rename to src/lib/evas/common/evas_op_sub/op_sub_pixel_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_color_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_.c rename to src/lib/evas/common/evas_op_sub/op_sub_pixel_color_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_i386.c rename to src/lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_i386.c rename to src/lib/evas/common/evas_op_sub/op_sub_pixel_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_.c rename to src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_i386.c rename to src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub_main_.c b/src/lib/evas/common/evas_op_sub_main_.c similarity index 98% rename from legacy/evas/src/lib/engines/common/evas_op_sub_main_.c rename to src/lib/evas/common/evas_op_sub_main_.c index 6f35d8caff..9301cacf6b 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_sub_main_.c +++ b/src/lib/evas/common/evas_op_sub_main_.c @@ -139,7 +139,7 @@ sub_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_sub_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -151,7 +151,7 @@ op_sub_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_sub_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -167,7 +167,7 @@ op_sub_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_sub_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -185,7 +185,7 @@ op_sub_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi } static RGBA_Gfx_Func -op_sub_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN; @@ -201,7 +201,7 @@ op_sub_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_sub_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN; @@ -363,7 +363,7 @@ sub_rel_gfx_span_func_cpu(int s, int m, int c, int d) } static RGBA_Gfx_Func -op_sub_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN; @@ -375,7 +375,7 @@ op_sub_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED_ } static RGBA_Gfx_Func -op_sub_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN; @@ -391,7 +391,7 @@ op_sub_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) } static RGBA_Gfx_Func -op_sub_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN; @@ -409,7 +409,7 @@ op_sub_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, in } static RGBA_Gfx_Func -op_sub_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN; @@ -425,7 +425,7 @@ op_sub_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED_ } static RGBA_Gfx_Func -op_sub_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__) +op_sub_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED) { int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN; diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_pipe.c rename to src/lib/evas/common/evas_pipe.c index 0d4734df08..2466dc0ca5 100644 --- a/legacy/evas/src/lib/engines/common/evas_pipe.c +++ b/src/lib/evas/common/evas_pipe.c @@ -610,7 +610,7 @@ evas_common_pipe_map_draw_do(RGBA_Image *dst, const RGBA_Pipe_Op *op, const RGBA } static Eina_Bool -evas_common_pipe_map_draw_prepare(void *data __UNUSED__, RGBA_Image *dst, RGBA_Pipe_Op *op) +evas_common_pipe_map_draw_prepare(void *data EINA_UNUSED, RGBA_Image *dst, RGBA_Pipe_Op *op) { RGBA_Draw_Context context; Eina_Bool r; diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.h b/src/lib/evas/common/evas_pipe.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_pipe.h rename to src/lib/evas/common/evas_pipe.h diff --git a/legacy/evas/src/lib/engines/common/evas_polygon.h b/src/lib/evas/common/evas_polygon.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_polygon.h rename to src/lib/evas/common/evas_polygon.h diff --git a/legacy/evas/src/lib/engines/common/evas_polygon_main.c b/src/lib/evas/common/evas_polygon_main.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_polygon_main.c rename to src/lib/evas/common/evas_polygon_main.c diff --git a/legacy/evas/src/lib/engines/common/evas_rectangle.h b/src/lib/evas/common/evas_rectangle.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_rectangle.h rename to src/lib/evas/common/evas_rectangle.h diff --git a/legacy/evas/src/lib/engines/common/evas_rectangle_main.c b/src/lib/evas/common/evas_rectangle_main.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_rectangle_main.c rename to src/lib/evas/common/evas_rectangle_main.c diff --git a/legacy/evas/src/lib/engines/common/evas_regionbuf.c b/src/lib/evas/common/evas_regionbuf.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_regionbuf.c rename to src/lib/evas/common/evas_regionbuf.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_main.c b/src/lib/evas/common/evas_scale_main.c similarity index 96% rename from legacy/evas/src/lib/engines/common/evas_scale_main.c rename to src/lib/evas/common/evas_scale_main.c index bb11c6bded..8ccfe706c1 100644 --- a/legacy/evas/src/lib/engines/common/evas_scale_main.c +++ b/src/lib/evas/common/evas_scale_main.c @@ -7,7 +7,7 @@ evas_common_scale_init(void) } EAPI Eina_Bool -evas_common_scale_rgba_in_to_out_clip_prepare(Cutout_Rects *reuse, const RGBA_Image *src __UNUSED__, +evas_common_scale_rgba_in_to_out_clip_prepare(Cutout_Rects *reuse, const RGBA_Image *src EINA_UNUSED, const RGBA_Image *dst, RGBA_Draw_Context *dc, int dst_region_x, int dst_region_y, diff --git a/legacy/evas/src/lib/engines/common/evas_scale_main.h b/src/lib/evas/common/evas_scale_main.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_main.h rename to src/lib/evas/common/evas_scale_main.h diff --git a/legacy/evas/src/lib/engines/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_sample.c rename to src/lib/evas/common/evas_scale_sample.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth.c b/src/lib/evas/common/evas_scale_smooth.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth.c rename to src/lib/evas/common/evas_scale_smooth.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth.h b/src/lib/evas/common/evas_scale_smooth.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth.h rename to src/lib/evas/common/evas_scale_smooth.h diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c b/src/lib/evas/common/evas_scale_smooth_scaler.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c rename to src/lib/evas/common/evas_scale_smooth_scaler.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_down.c b/src/lib/evas/common/evas_scale_smooth_scaler_down.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_down.c rename to src/lib/evas/common/evas_scale_smooth_scaler_down.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c b/src/lib/evas/common/evas_scale_smooth_scaler_downx.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c rename to src/lib/evas/common/evas_scale_smooth_scaler_downx.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c b/src/lib/evas/common/evas_scale_smooth_scaler_downx_downy.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c rename to src/lib/evas/common/evas_scale_smooth_scaler_downx_downy.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c b/src/lib/evas/common/evas_scale_smooth_scaler_downy.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c rename to src/lib/evas/common/evas_scale_smooth_scaler_downy.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_noscale.c b/src/lib/evas/common/evas_scale_smooth_scaler_noscale.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_noscale.c rename to src/lib/evas/common/evas_scale_smooth_scaler_noscale.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_up.c b/src/lib/evas/common/evas_scale_smooth_scaler_up.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_up.c rename to src/lib/evas/common/evas_scale_smooth_scaler_up.c diff --git a/legacy/evas/src/lib/engines/common/evas_scale_span.c b/src/lib/evas/common/evas_scale_span.c similarity index 97% rename from legacy/evas/src/lib/engines/common/evas_scale_span.c rename to src/lib/evas/common/evas_scale_span.c index e0fefb24ab..5182a97c36 100644 --- a/legacy/evas/src/lib/engines/common/evas_scale_span.c +++ b/src/lib/evas/common/evas_scale_span.c @@ -3,7 +3,7 @@ #include "evas_scale_span.h" static void -evas_common_scale_rgba_span_(DATA32 *src, DATA8 *mask __UNUSED__, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) +evas_common_scale_rgba_span_(DATA32 *src, DATA8 *mask EINA_UNUSED, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { int mul = 0, step = 1; DATA32 *pdst = dst; @@ -234,7 +234,7 @@ evas_common_scale_rgba_a8_span_(DATA32 *src, DATA8 *mask, int src_len, DATA32 mu } static void -evas_common_scale_a8_span_(DATA32 *src __UNUSED__, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) +evas_common_scale_a8_span_(DATA32 *src EINA_UNUSED, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { int step = 1; DATA32 *pdst = dst; @@ -309,7 +309,7 @@ evas_common_scale_a8_span_(DATA32 *src __UNUSED__, DATA8 *mask, int src_len, DAT } static void -evas_common_scale_clip_a8_span_(DATA32 *src __UNUSED__, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) +evas_common_scale_clip_a8_span_(DATA32 *src EINA_UNUSED, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { int mul = 0, step = 1; DATA32 *pdst = dst; @@ -476,7 +476,7 @@ evas_common_scale_clip_a8_span(DATA32 *src, DATA8 *mask, int src_len, DATA32 mul } EAPI void -evas_common_scale_hsva_span(DATA32 *src, DATA8 *mask __UNUSED__, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) +evas_common_scale_hsva_span(DATA32 *src, DATA8 *mask EINA_UNUSED, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir) { int mul = 0, step = 1; DATA32 *pdst = dst; diff --git a/legacy/evas/src/lib/engines/common/evas_scale_span.h b/src/lib/evas/common/evas_scale_span.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_scale_span.h rename to src/lib/evas/common/evas_scale_span.h diff --git a/legacy/evas/src/lib/engines/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_text_utils.c rename to src/lib/evas/common/evas_text_utils.c diff --git a/legacy/evas/src/lib/engines/common/evas_text_utils.h b/src/lib/evas/common/evas_text_utils.h similarity index 100% rename from legacy/evas/src/lib/engines/common/evas_text_utils.h rename to src/lib/evas/common/evas_text_utils.h diff --git a/legacy/evas/src/lib/engines/common/evas_tiler.c b/src/lib/evas/common/evas_tiler.c similarity index 99% rename from legacy/evas/src/lib/engines/common/evas_tiler.c rename to src/lib/evas/common/evas_tiler.c index bc5e99c44b..bd16d12330 100644 --- a/legacy/evas/src/lib/engines/common/evas_tiler.c +++ b/src/lib/evas/common/evas_tiler.c @@ -1108,7 +1108,7 @@ evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h) } EAPI int -evas_common_tilebuf_add_motion_vector(Tilebuf *tb __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dx __UNUSED__, int dy __UNUSED__, int alpha __UNUSED__) +evas_common_tilebuf_add_motion_vector(Tilebuf *tb EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dx EINA_UNUSED, int dy EINA_UNUSED, int alpha EINA_UNUSED) { #ifdef EVAS_RECT_SPLIT /* motion vector handling never has been used -> disable it diff --git a/legacy/evas/src/lib/engines/common/language/evas_bidi_utils.c b/src/lib/evas/common/language/evas_bidi_utils.c similarity index 100% rename from legacy/evas/src/lib/engines/common/language/evas_bidi_utils.c rename to src/lib/evas/common/language/evas_bidi_utils.c diff --git a/legacy/evas/src/lib/engines/common/language/evas_bidi_utils.h b/src/lib/evas/common/language/evas_bidi_utils.h similarity index 100% rename from legacy/evas/src/lib/engines/common/language/evas_bidi_utils.h rename to src/lib/evas/common/language/evas_bidi_utils.h diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c b/src/lib/evas/common/language/evas_language_utils.c similarity index 100% rename from legacy/evas/src/lib/engines/common/language/evas_language_utils.c rename to src/lib/evas/common/language/evas_language_utils.c diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.h b/src/lib/evas/common/language/evas_language_utils.h similarity index 100% rename from legacy/evas/src/lib/engines/common/language/evas_language_utils.h rename to src/lib/evas/common/language/evas_language_utils.h diff --git a/legacy/evas/src/lib/engines/common/language/evas_script_table.h b/src/lib/evas/common/language/evas_script_table.h similarity index 100% rename from legacy/evas/src/lib/engines/common/language/evas_script_table.h rename to src/lib/evas/common/language/evas_script_table.h diff --git a/legacy/evas/src/lib/cserve2/evas_cs2.h b/src/lib/evas/cserve2/evas_cs2.h similarity index 100% rename from legacy/evas/src/lib/cserve2/evas_cs2.h rename to src/lib/evas/cserve2/evas_cs2.h diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c similarity index 99% rename from legacy/evas/src/lib/cserve2/evas_cs2_client.c rename to src/lib/evas/cserve2/evas_cs2_client.c index df45b0acf5..d49ed56413 100644 --- a/legacy/evas/src/lib/cserve2/evas_cs2_client.c +++ b/src/lib/evas/cserve2/evas_cs2_client.c @@ -473,7 +473,7 @@ _build_absolute_path(const char *path, char buf[], int size) } static unsigned int -_image_open_server_send(Image_Entry *ie, const char *file, const char *key, RGBA_Image_Loadopts *lopt __UNUSED__) +_image_open_server_send(Image_Entry *ie, const char *file, const char *key, RGBA_Image_Loadopts *lopt EINA_UNUSED) { int flen, klen; int size; diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_image_data.c b/src/lib/evas/cserve2/evas_cs2_image_data.c similarity index 100% rename from legacy/evas/src/lib/cserve2/evas_cs2_image_data.c rename to src/lib/evas/cserve2/evas_cs2_image_data.c diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_private.h b/src/lib/evas/cserve2/evas_cs2_private.h similarity index 100% rename from legacy/evas/src/lib/cserve2/evas_cs2_private.h rename to src/lib/evas/cserve2/evas_cs2_private.h diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_utils.c b/src/lib/evas/cserve2/evas_cs2_utils.c similarity index 100% rename from legacy/evas/src/lib/cserve2/evas_cs2_utils.c rename to src/lib/evas/cserve2/evas_cs2_utils.c diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_utils.h b/src/lib/evas/cserve2/evas_cs2_utils.h similarity index 100% rename from legacy/evas/src/lib/cserve2/evas_cs2_utils.h rename to src/lib/evas/cserve2/evas_cs2_utils.h diff --git a/legacy/evas/src/lib/file/evas_module.c b/src/lib/evas/file/evas_module.c similarity index 100% rename from legacy/evas/src/lib/file/evas_module.c rename to src/lib/evas/file/evas_module.c diff --git a/legacy/evas/src/lib/file/evas_module.h b/src/lib/evas/file/evas_module.h similarity index 100% rename from legacy/evas/src/lib/file/evas_module.h rename to src/lib/evas/file/evas_module.h diff --git a/legacy/evas/src/lib/file/evas_path.c b/src/lib/evas/file/evas_path.c similarity index 100% rename from legacy/evas/src/lib/file/evas_path.c rename to src/lib/evas/file/evas_path.c diff --git a/legacy/evas/src/lib/file/evas_path.h b/src/lib/evas/file/evas_path.h similarity index 100% rename from legacy/evas/src/lib/file/evas_path.h rename to src/lib/evas/file/evas_path.h diff --git a/legacy/evas/src/lib/include/evas_blend_ops.h b/src/lib/evas/include/evas_blend_ops.h similarity index 100% rename from legacy/evas/src/lib/include/evas_blend_ops.h rename to src/lib/evas/include/evas_blend_ops.h index 6bd1f165ed..828b2856a6 100644 --- a/legacy/evas/src/lib/include/evas_blend_ops.h +++ b/src/lib/evas/include/evas_blend_ops.h @@ -1,12 +1,12 @@ #ifndef EVAS_BLEND_OPS_H #define EVAS_BLEND_OPS_H +#include "config.h" + #if defined BUILD_MMX || defined BUILD_SSE #include "evas_mmx.h" #endif -#include "config.h" - #ifdef NEED_SSE3 # if defined BUILD_SSE3 # include diff --git a/legacy/evas/src/lib/include/evas_common.h b/src/lib/evas/include/evas_common.h similarity index 97% rename from legacy/evas/src/lib/include/evas_common.h rename to src/lib/evas/include/evas_common.h index 85a455d93e..e4cfff99e6 100644 --- a/legacy/evas/src/lib/include/evas_common.h +++ b/src/lib/evas/include/evas_common.h @@ -702,8 +702,8 @@ struct _RGBA_Draw_Context }; #ifdef BUILD_PIPE_RENDER -#include "../engines/common/evas_map_image.h" -#include "../engines/common/evas_text_utils.h" +#include "../common/evas_map_image.h" +#include "../common/evas_text_utils.h" struct _RGBA_Pipe_Op { @@ -917,7 +917,7 @@ struct _RGBA_Font unsigned char sizeok : 1; }; -#include "../engines/common/evas_font_ot.h" +#include "../common/evas_font_ot.h" struct _RGBA_Font_Int { @@ -1203,26 +1203,26 @@ EAPI void evas_common_cpu_can_do (int *mmx, int *sse, int EAPI void evas_common_cpu_end_opt (void); /****/ -#include "../engines/common/evas_blend.h" +#include "../common/evas_blend.h" EAPI Gfx_Func_Copy evas_common_draw_func_copy_get (int pixels, int reverse); /****/ -#include "../engines/common/evas_convert_color.h" -#include "../engines/common/evas_convert_colorspace.h" -#include "../engines/common/evas_convert_main.h" -#include "../engines/common/evas_convert_yuv.h" -#include "../engines/common/evas_scale_main.h" -#include "../engines/common/evas_scale_smooth.h" -#include "../engines/common/evas_scale_span.h" +#include "../common/evas_convert_color.h" +#include "../common/evas_convert_colorspace.h" +#include "../common/evas_convert_main.h" +#include "../common/evas_convert_yuv.h" +#include "../common/evas_scale_main.h" +#include "../common/evas_scale_smooth.h" +#include "../common/evas_scale_span.h" /****/ -#include "../engines/common/evas_image.h" +#include "../common/evas_image.h" /****/ -#include "../engines/common/evas_line.h" -#include "../engines/common/evas_polygon.h" -#include "../engines/common/evas_rectangle.h" +#include "../common/evas_line.h" +#include "../common/evas_polygon.h" +#include "../common/evas_rectangle.h" /****/ EAPI void evas_common_blit_init (void); @@ -1230,7 +1230,7 @@ EAPI void evas_common_blit_init (void); EAPI void evas_common_blit_rectangle (const RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, int h, int dst_x, int dst_y); /****/ -#include "../engines/common/evas_font.h" +#include "../common/evas_font.h" /****/ EAPI void evas_common_tilebuf_init (void); @@ -1256,12 +1256,12 @@ Tilebuf_Rect *evas_common_regionbuf_rects_get (Regionbuf *rb); */ /****/ -#include "../engines/common/evas_draw.h" +#include "../common/evas_draw.h" -#include "../engines/common/evas_map_image.h" +#include "../common/evas_map_image.h" /****/ -#include "../engines/common/evas_pipe.h" +#include "../common/evas_pipe.h" void evas_font_dir_cache_free(void); diff --git a/legacy/evas/src/lib/include/evas_inline.x b/src/lib/evas/include/evas_inline.x similarity index 95% rename from legacy/evas/src/lib/include/evas_inline.x rename to src/lib/evas/include/evas_inline.x index 4ad3727b89..8d72291f88 100644 --- a/legacy/evas/src/lib/include/evas_inline.x +++ b/src/lib/evas/include/evas_inline.x @@ -79,7 +79,7 @@ evas_object_is_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) } static inline int -evas_event_freezes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj) +evas_event_freezes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->freeze_events) return 1; if (obj->parent_cache.freeze_events_valid) @@ -93,7 +93,7 @@ evas_event_freezes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected } static inline int -evas_event_passes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj) +evas_event_passes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->pass_events) return 1; if (obj->parent_cache.pass_events_valid) @@ -107,7 +107,7 @@ evas_event_passes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_ } static inline int -evas_object_is_source_invisible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj) +evas_object_is_source_invisible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->parent_cache.src_invisible_valid) return obj->parent_cache.src_invisible; @@ -137,7 +137,7 @@ evas_object_is_visible(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) } static inline int -evas_object_clippers_is_visible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj) +evas_object_clippers_is_visible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->cur.visible) { @@ -152,7 +152,7 @@ evas_object_clippers_is_visible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Prot } static inline int -evas_object_is_in_output_rect(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj, int x, int y, int w, int h) +evas_object_is_in_output_rect(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, int x, int y, int w, int h) { /* assumes coords have been recalced */ if ((RECTS_INTERSECT(x, y, w, h, diff --git a/legacy/evas/src/lib/include/evas_macros.h b/src/lib/evas/include/evas_macros.h similarity index 100% rename from legacy/evas/src/lib/include/evas_macros.h rename to src/lib/evas/include/evas_macros.h diff --git a/legacy/evas/src/lib/include/evas_mmx.h b/src/lib/evas/include/evas_mmx.h similarity index 100% rename from legacy/evas/src/lib/include/evas_mmx.h rename to src/lib/evas/include/evas_mmx.h diff --git a/legacy/evas/src/lib/include/evas_options.h b/src/lib/evas/include/evas_options.h similarity index 100% rename from legacy/evas/src/lib/include/evas_options.h rename to src/lib/evas/include/evas_options.h diff --git a/legacy/evas/src/lib/include/evas_private.h b/src/lib/evas/include/evas_private.h similarity index 98% rename from legacy/evas/src/lib/include/evas_private.h rename to src/lib/evas/include/evas_private.h index e6536fdad3..357eae0cbf 100644 --- a/legacy/evas/src/lib/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h @@ -7,18 +7,15 @@ #include #include + #include "Evas.h" #include "../file/evas_module.h" #include "../file/evas_path.h" -#include "../engines/common/evas_text_utils.h" -#include "../engines/common/language/evas_bidi_utils.h" -#include "../engines/common/language/evas_language_utils.h" +#include "../common/evas_text_utils.h" +#include "../common/language/evas_bidi_utils.h" +#include "../common/language/evas_language_utils.h" -#ifdef EVAS_MAGIC_DEBUG -/* complain when peole pass in wrong object types etc. */ -# define MAGIC_DEBUG -#endif #define RENDER_METHOD_INVALID 0x00000000 @@ -124,7 +121,7 @@ OPAQUE_TYPE(Evas_Font_Instance); /* General type for RGBA_Font_Int */ #define MAGIC_MAP 0x7575177d #define MAGIC_DEV 0x7d773738 -#ifdef MAGIC_DEBUG +#ifdef EINA_MAGIC_DEBUG # define MAGIC_CHECK_FAILED(o, t, m) \ {evas_debug_error(); \ if (!o) evas_debug_input_null(); \ @@ -903,7 +900,7 @@ struct _Evas_Func void (*image_content_hint_set) (void *data, void *surface, int hint); int (*image_content_hint_get) (void *data, void *surface); int (*font_pen_coords_get) (void *data, Evas_Font_Set *font, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch); - Eina_Bool (*font_text_props_info_create) (void *data __UNUSED__, Evas_Font_Instance *fi, const Eina_Unicode *text, Evas_Text_Props *intl_props, const Evas_BiDi_Paragraph_Props *par_props, size_t pos, size_t len, Evas_Text_Props_Mode mode); + Eina_Bool (*font_text_props_info_create) (void *data, Evas_Font_Instance *fi, const Eina_Unicode *text, Evas_Text_Props *intl_props, const Evas_BiDi_Paragraph_Props *par_props, size_t pos, size_t len, Evas_Text_Props_Mode mode); int (*font_right_inset_get) (void *data, Evas_Font_Set *font, const Evas_Text_Props *text_props); #if 0 // filtering disabled diff --git a/legacy/evas/src/lib/main.c b/src/lib/evas/main.c similarity index 97% rename from legacy/evas/src/lib/main.c rename to src/lib/evas/main.c index 0431977589..604c14d996 100644 --- a/legacy/evas/src/lib/main.c +++ b/src/lib/evas/main.c @@ -21,14 +21,14 @@ evas_alloc_error(void) /* free cached items only in ram for speed reasons. return 0 if can't free */ int -evas_mem_free(int mem_required __UNUSED__) +evas_mem_free(int mem_required EINA_UNUSED) { return 0; } /* start reducing quality of images etc. return 0 if can't free anything */ int -evas_mem_degrade(int mem_required __UNUSED__) +evas_mem_degrade(int mem_required EINA_UNUSED) { return 0; } diff --git a/legacy/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h b/src/modules/evas/engines/buffer/Evas_Engine_Buffer.h similarity index 100% rename from legacy/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h rename to src/modules/evas/engines/buffer/Evas_Engine_Buffer.h diff --git a/legacy/evas/src/modules/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c similarity index 97% rename from legacy/evas/src/modules/engines/buffer/evas_engine.c rename to src/modules/evas/engines/buffer/evas_engine.c index 3e12a7e77b..f492ba9ae1 100644 --- a/legacy/evas/src/modules/engines/buffer/evas_engine.c +++ b/src/modules/evas/engines/buffer/evas_engine.c @@ -32,8 +32,8 @@ struct _Render_Engine /* prototypes we will use here */ static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data), void *(*switch_buffer) (void *data, void *dest_buffer), void *switch_data); -static void *eng_info(Evas *eo_e __UNUSED__); -static void eng_info_free(Evas *eo_e __UNUSED__, void *info); +static void *eng_info(Evas *eo_e EINA_UNUSED); +static void eng_info_free(Evas *eo_e EINA_UNUSED, void *info); static int eng_setup(Evas *eo_e, void *info); static void eng_output_free(void *data); static void eng_output_resize(void *data, int w, int h); @@ -125,7 +125,7 @@ _output_setup(int w, /* engine api this module provides */ static void * -eng_info(Evas *eo_e __UNUSED__) +eng_info(Evas *eo_e EINA_UNUSED) { Evas_Engine_Info_Buffer *info; info = calloc(1, sizeof(Evas_Engine_Info_Buffer)); @@ -136,7 +136,7 @@ eng_info(Evas *eo_e __UNUSED__) } static void -eng_info_free(Evas *eo_e __UNUSED__, void *info) +eng_info_free(Evas *eo_e EINA_UNUSED, void *info) { Evas_Engine_Info_Buffer *in; in = (Evas_Engine_Info_Buffer *)info; @@ -366,12 +366,12 @@ eng_output_flush(void *data) } static void -eng_output_idle_flush(void *data __UNUSED__) +eng_output_idle_flush(void *data EINA_UNUSED) { } static Eina_Bool -eng_canvas_alpha_get(void *data, void *context __UNUSED__) +eng_canvas_alpha_get(void *data, void *context EINA_UNUSED) { Render_Engine *re; @@ -421,7 +421,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_engine_buffer_log_dom); } diff --git a/legacy/evas/src/modules/engines/buffer/evas_engine.h b/src/modules/evas/engines/buffer/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/buffer/evas_engine.h rename to src/modules/evas/engines/buffer/evas_engine.h diff --git a/legacy/evas/src/modules/engines/buffer/evas_outbuf.c b/src/modules/evas/engines/buffer/evas_outbuf.c similarity index 100% rename from legacy/evas/src/modules/engines/buffer/evas_outbuf.c rename to src/modules/evas/engines/buffer/evas_outbuf.c diff --git a/legacy/evas/src/modules/engines/direct3d/Evas_Engine_Direct3D.h b/src/modules/evas/engines/direct3d/Evas_Engine_Direct3D.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/Evas_Engine_Direct3D.h rename to src/modules/evas/engines/direct3d/Evas_Engine_Direct3D.h diff --git a/legacy/evas/src/modules/engines/direct3d/array.h b/src/modules/evas/engines/direct3d/array.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/array.h rename to src/modules/evas/engines/direct3d/array.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_buffer.c b/src/modules/evas/engines/direct3d/evas_direct3d_buffer.c similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_buffer.c rename to src/modules/evas/engines/direct3d/evas_direct3d_buffer.c diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_context.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_context.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.h b/src/modules/evas/engines/direct3d/evas_direct3d_context.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.h rename to src/modules/evas/engines/direct3d/evas_direct3d_context.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_device.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_device.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.h b/src/modules/evas/engines/direct3d/evas_direct3d_device.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.h rename to src/modules/evas/engines/direct3d/evas_direct3d_device.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.h b/src/modules/evas/engines/direct3d/evas_direct3d_image_cache.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.h rename to src/modules/evas/engines/direct3d/evas_direct3d_image_cache.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_main.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_main.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_main.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_main.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_object.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.h b/src/modules/evas/engines/direct3d/evas_direct3d_object.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.h rename to src/modules/evas/engines/direct3d/evas_direct3d_object.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object_font.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_object_font.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.h b/src/modules/evas/engines/direct3d/evas_direct3d_object_font.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.h rename to src/modules/evas/engines/direct3d/evas_direct3d_object_font.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object_image.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_object_image.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.h b/src/modules/evas/engines/direct3d/evas_direct3d_object_image.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.h rename to src/modules/evas/engines/direct3d/evas_direct3d_object_image.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object_line.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_object_line.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.h b/src/modules/evas/engines/direct3d/evas_direct3d_object_line.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.h rename to src/modules/evas/engines/direct3d/evas_direct3d_object_line.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.h b/src/modules/evas/engines/direct3d/evas_direct3d_object_rect.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.h rename to src/modules/evas/engines/direct3d/evas_direct3d_object_rect.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_scene.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_scene.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.h b/src/modules/evas/engines/direct3d/evas_direct3d_scene.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.h rename to src/modules/evas/engines/direct3d/evas_direct3d_scene.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.h b/src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.h rename to src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp rename to src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.h b/src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.h rename to src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.h diff --git a/legacy/evas/src/modules/engines/direct3d/evas_engine.c b/src/modules/evas/engines/direct3d/evas_engine.c similarity index 98% rename from legacy/evas/src/modules/engines/direct3d/evas_engine.c rename to src/modules/evas/engines/direct3d/evas_engine.c index 159f5c5f8d..d66a7fec75 100644 --- a/legacy/evas/src/modules/engines/direct3d/evas_engine.c +++ b/src/modules/evas/engines/direct3d/evas_engine.c @@ -379,12 +379,12 @@ eng_image_border_get(void *data, void *image, int *l, int *r, int *t, int *b) } static void -eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint) { } static int -eng_image_scale_hint_get(void *data __UNUSED__, void *image) +eng_image_scale_hint_get(void *data EINA_UNUSED, void *image) { return EVAS_IMAGE_SCALE_HINT_NONE; } diff --git a/legacy/evas/src/modules/engines/direct3d/evas_engine.h b/src/modules/evas/engines/direct3d/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/evas_engine.h rename to src/modules/evas/engines/direct3d/evas_engine.h diff --git a/legacy/evas/src/modules/engines/direct3d/ref.h b/src/modules/evas/engines/direct3d/ref.h similarity index 100% rename from legacy/evas/src/modules/engines/direct3d/ref.h rename to src/modules/evas/engines/direct3d/ref.h diff --git a/legacy/evas/src/modules/engines/directfb/Evas_Engine_DirectFB.h b/src/modules/evas/engines/directfb/Evas_Engine_DirectFB.h similarity index 100% rename from legacy/evas/src/modules/engines/directfb/Evas_Engine_DirectFB.h rename to src/modules/evas/engines/directfb/Evas_Engine_DirectFB.h diff --git a/legacy/evas/src/modules/engines/directfb/evas_engine.c b/src/modules/evas/engines/directfb/evas_engine.c similarity index 94% rename from legacy/evas/src/modules/engines/directfb/evas_engine.c rename to src/modules/evas/engines/directfb/evas_engine.c index ec4cc6583d..3dc599f4e2 100644 --- a/legacy/evas/src/modules/engines/directfb/evas_engine.c +++ b/src/modules/evas/engines/directfb/evas_engine.c @@ -531,7 +531,7 @@ evas_cache_image_dfb_dirty(Engine_Image_Entry *dst, const Engine_Image_Entry *sr } static void -evas_cache_image_dfb_dirty_region(Engine_Image_Entry *eim, unsigned int x __UNUSED__, unsigned int y __UNUSED__, unsigned int w __UNUSED__, unsigned int h __UNUSED__) +evas_cache_image_dfb_dirty_region(Engine_Image_Entry *eim, unsigned int x EINA_UNUSED, unsigned int y EINA_UNUSED, unsigned int w EINA_UNUSED, unsigned int h EINA_UNUSED) { RGBA_Image *im; @@ -665,7 +665,7 @@ static const Evas_Cache_Engine_Image_Func _dfb_cache_engine_image_cb = { * Evas Engine **********************************************************************/ static void * -evas_engine_dfb_info(Evas* e __UNUSED__) +evas_engine_dfb_info(Evas* e EINA_UNUSED) { Evas_Engine_Info_DirectFB *info; info = calloc(1, sizeof(Evas_Engine_Info_DirectFB)); @@ -676,7 +676,7 @@ evas_engine_dfb_info(Evas* e __UNUSED__) } static void -evas_engine_dfb_info_free(Evas *e __UNUSED__, void *in) +evas_engine_dfb_info_free(Evas *e EINA_UNUSED, void *in) { Evas_Engine_Info_DirectFB *info = in; free(info); @@ -946,7 +946,7 @@ evas_engine_dfb_output_redraws_next_update_get(void *data, int *x, int *y, int * } static void -evas_engine_dfb_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x, int y, int w, int h) +evas_engine_dfb_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x, int y, int w, int h) { Render_Engine *re = data; DFBRegion *r; @@ -1037,7 +1037,7 @@ evas_engine_dfb_output_idle_flush(void *data) * memory. */ static void -evas_engine_dfb_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UNUSED__, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props) +evas_engine_dfb_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font EINA_UNUSED, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props) { DirectFB_Engine_Image_Entry *eim = surface; IDirectFBSurface *screen; @@ -1060,7 +1060,7 @@ evas_engine_dfb_font_draw(void *data, void *context, void *surface, Evas_Font_Se static void -_cb_draw_line(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data) +_cb_draw_line(IDirectFBSurface *surface, RGBA_Draw_Context *dc EINA_UNUSED, const DFBRegion *region EINA_UNUSED, void *data) { const Eina_Rectangle *r = data; @@ -1068,7 +1068,7 @@ _cb_draw_line(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const } static void -evas_engine_dfb_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2) +evas_engine_dfb_line_draw(void *data EINA_UNUSED, void *context, void *surface, int x1, int y1, int x2, int y2) { DirectFB_Engine_Image_Entry *eim = surface; Eina_Rectangle r; @@ -1082,7 +1082,7 @@ evas_engine_dfb_line_draw(void *data __UNUSED__, void *context, void *surface, i #ifndef DFB_USE_EVAS_RECT_DRAW static void -_cb_draw_rectangle(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data) +_cb_draw_rectangle(IDirectFBSurface *surface, RGBA_Draw_Context *dc EINA_UNUSED, const DFBRegion *region EINA_UNUSED, void *data) { const Eina_Rectangle *r = data; @@ -1137,7 +1137,7 @@ evas_engine_dfb_rectangle_draw(void *data, void *context, void *surface, int x, #ifndef DFB_USE_EVAS_POLYGON_DRAW static void -evas_engine_dfb_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y) +evas_engine_dfb_polygon_draw(void *data EINA_UNUSED, void *context, void *surface, void *polygon, int x, int y) { DirectFB_Engine_Image_Entry *eim = surface; _dfb_polygon_draw(eim->surface, context, polygon, x, y); @@ -1177,7 +1177,7 @@ evas_engine_dfb_image_load(void *data, const char *file, const char *key, int *e } static int -evas_engine_dfb_image_alpha_get(void *data __UNUSED__, void *image) +evas_engine_dfb_image_alpha_get(void *data EINA_UNUSED, void *image) { DirectFB_Engine_Image_Entry *eim = image; Image_Entry *ie; @@ -1197,7 +1197,7 @@ evas_engine_dfb_image_alpha_get(void *data __UNUSED__, void *image) } static void -evas_engine_dfb_image_size_get(void *data __UNUSED__, void *image, int *w, int *h) +evas_engine_dfb_image_size_get(void *data EINA_UNUSED, void *image, int *w, int *h) { DirectFB_Engine_Image_Entry *eim = image; Image_Entry *ie; @@ -1208,7 +1208,7 @@ evas_engine_dfb_image_size_get(void *data __UNUSED__, void *image, int *w, int * } static int -evas_engine_dfb_image_colorspace_get(void *data __UNUSED__, void *image) +evas_engine_dfb_image_colorspace_get(void *data EINA_UNUSED, void *image) { DirectFB_Engine_Image_Entry *eim = image; @@ -1246,7 +1246,7 @@ evas_engine_dfb_image_new_from_data(void *data, int w, int h, DATA32* image_data } static void -evas_engine_dfb_image_free(void *data __UNUSED__, void *image) +evas_engine_dfb_image_free(void *data EINA_UNUSED, void *image) { DirectFB_Engine_Image_Entry *eim = image; @@ -1254,7 +1254,7 @@ evas_engine_dfb_image_free(void *data __UNUSED__, void *image) } static void * -evas_engine_dfb_image_size_set(void *data __UNUSED__, void *image, int w, int h) +evas_engine_dfb_image_size_set(void *data EINA_UNUSED, void *image, int w, int h) { DirectFB_Engine_Image_Entry *eim = image; @@ -1262,7 +1262,7 @@ evas_engine_dfb_image_size_set(void *data __UNUSED__, void *image, int w, int h) } static void * -evas_engine_dfb_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h) +evas_engine_dfb_image_dirty_region(void *data EINA_UNUSED, void *image, int x, int y, int w, int h) { DirectFB_Engine_Image_Entry *eim = image; @@ -1270,7 +1270,7 @@ evas_engine_dfb_image_dirty_region(void *data __UNUSED__, void *image, int x, in } static void * -evas_engine_dfb_image_data_get(void *data __UNUSED__, void *image, int to_write, DATA32** image_data, int *err __UNUSED__) +evas_engine_dfb_image_data_get(void *data EINA_UNUSED, void *image, int to_write, DATA32** image_data, int *err EINA_UNUSED) { DirectFB_Engine_Image_Entry *deie = image; Engine_Image_Entry *ce; @@ -1405,7 +1405,7 @@ evas_engine_dfb_image_data_put(void *data, void *image, DATA32* image_data) } static void -evas_engine_dfb_image_data_preload_request(void *data __UNUSED__, void *image, const void *target) +evas_engine_dfb_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target) { DirectFB_Engine_Image_Entry *deie = image; RGBA_Image *im; @@ -1417,7 +1417,7 @@ evas_engine_dfb_image_data_preload_request(void *data __UNUSED__, void *image, c } static void -evas_engine_dfb_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target) +evas_engine_dfb_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target) { DirectFB_Engine_Image_Entry *deie = image; RGBA_Image *im; @@ -1429,7 +1429,7 @@ evas_engine_dfb_image_data_preload_cancel(void *data __UNUSED__, void *image, co } static void * -evas_engine_dfb_image_alpha_set(void *data __UNUSED__, void *image, int has_alpha) +evas_engine_dfb_image_alpha_set(void *data EINA_UNUSED, void *image, int has_alpha) { DirectFB_Engine_Image_Entry *eim = image; Engine_Image_Entry *ce; @@ -1462,7 +1462,7 @@ struct _for_each_cutout_image }; static void -_cb_draw_image_unscaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data) +_cb_draw_image_unscaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc EINA_UNUSED, const DFBRegion *region EINA_UNUSED, void *data) { const struct _for_each_cutout_image *p = data; @@ -1470,7 +1470,7 @@ _cb_draw_image_unscaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSE } static void -_cb_draw_image_scaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data) +_cb_draw_image_scaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc EINA_UNUSED, const DFBRegion *region EINA_UNUSED, void *data) { const struct _for_each_cutout_image *p = data; @@ -1479,7 +1479,7 @@ _cb_draw_image_scaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED_ #ifndef DFB_USE_EVAS_IMAGE_DRAW static void -evas_engine_dfb_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth __UNUSED__) +evas_engine_dfb_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth EINA_UNUSED) { DirectFB_Engine_Image_Entry *eim = surface; Render_Engine *re = data; @@ -1555,7 +1555,7 @@ evas_engine_dfb_image_draw(void *data, void *context, void *surface, void *image #endif static void -evas_engine_dfb_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level) +evas_engine_dfb_image_map_draw(void *data EINA_UNUSED, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level) { Render_Engine *re = (Render_Engine*) data; DirectFB_Engine_Image_Entry *deie = image; @@ -1600,7 +1600,7 @@ evas_engine_dfb_image_map_surface_new(void *data, int w, int h, int alpha) } static void -evas_engine_dfb_image_map_surface_free(void *data __UNUSED__, void *surface) +evas_engine_dfb_image_map_surface_free(void *data EINA_UNUSED, void *surface) { evas_cache_engine_image_drop(surface); } @@ -1634,7 +1634,7 @@ evas_engine_dfb_image_cache_get(void *data) } static char * -evas_engine_dfb_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) +evas_engine_dfb_image_comment_get(void *data EINA_UNUSED, void *image, char *key EINA_UNUSED) { DirectFB_Engine_Image_Entry *eim = image; RGBA_Image *im; @@ -1646,12 +1646,12 @@ evas_engine_dfb_image_comment_get(void *data __UNUSED__, void *image, char *key } static void -evas_engine_dfb_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) +evas_engine_dfb_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint) { } static int -evas_engine_dfb_image_scale_hint_get(void *data __UNUSED__, void *image) +evas_engine_dfb_image_scale_hint_get(void *data EINA_UNUSED, void *image) { return EVAS_IMAGE_SCALE_HINT_NONE; } diff --git a/legacy/evas/src/modules/engines/directfb/evas_engine.h b/src/modules/evas/engines/directfb/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/directfb/evas_engine.h rename to src/modules/evas/engines/directfb/evas_engine.h diff --git a/legacy/evas/src/modules/engines/directfb/polygon.c b/src/modules/evas/engines/directfb/polygon.c similarity index 99% rename from legacy/evas/src/modules/engines/directfb/polygon.c rename to src/modules/evas/engines/directfb/polygon.c index 715fd840c5..d040c9d9d8 100644 --- a/legacy/evas/src/modules/engines/directfb/polygon.c +++ b/src/modules/evas/engines/directfb/polygon.c @@ -82,7 +82,7 @@ polygon_edge_sorter(const void *a, const void *b) typedef DFBSpan span_t; static void -polygon_span_add(span_t *span, int y __UNUSED__, int x, int w) +polygon_span_add(span_t *span, int y EINA_UNUSED, int x, int w) { span->x = x; span->w = w; diff --git a/legacy/evas/src/modules/engines/fb/Evas_Engine_FB.h b/src/modules/evas/engines/fb/Evas_Engine_FB.h similarity index 100% rename from legacy/evas/src/modules/engines/fb/Evas_Engine_FB.h rename to src/modules/evas/engines/fb/Evas_Engine_FB.h diff --git a/legacy/evas/src/modules/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c similarity index 96% rename from legacy/evas/src/modules/engines/fb/evas_engine.c rename to src/modules/evas/engines/fb/evas_engine.c index 6e63e6fe6a..6c934c586f 100644 --- a/legacy/evas/src/modules/engines/fb/evas_engine.c +++ b/src/modules/evas/engines/fb/evas_engine.c @@ -74,7 +74,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int refresh) /* engine api this module provides */ static void * -eng_info(Evas *eo_e __UNUSED__) +eng_info(Evas *eo_e EINA_UNUSED) { Evas_Engine_Info_FB *info; info = calloc(1, sizeof(Evas_Engine_Info_FB)); @@ -85,7 +85,7 @@ eng_info(Evas *eo_e __UNUSED__) } static void -eng_info_free(Evas *eo_e __UNUSED__, void *info) +eng_info_free(Evas *eo_e EINA_UNUSED, void *info) { Evas_Engine_Info_FB *in; in = (Evas_Engine_Info_FB *)info; @@ -231,17 +231,17 @@ eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int } static void -eng_output_flush(void *data __UNUSED__) +eng_output_flush(void *data EINA_UNUSED) { } static void -eng_output_idle_flush(void *data __UNUSED__) +eng_output_idle_flush(void *data EINA_UNUSED) { } static Eina_Bool -eng_canvas_alpha_get(void *data, void *context __UNUSED__) +eng_canvas_alpha_get(void *data, void *context EINA_UNUSED) { Render_Engine *re; @@ -288,7 +288,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_engine_fb_log_dom); } diff --git a/legacy/evas/src/modules/engines/fb/evas_engine.h b/src/modules/evas/engines/fb/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/fb/evas_engine.h rename to src/modules/evas/engines/fb/evas_engine.h diff --git a/legacy/evas/src/modules/engines/fb/evas_fb.h b/src/modules/evas/engines/fb/evas_fb.h similarity index 100% rename from legacy/evas/src/modules/engines/fb/evas_fb.h rename to src/modules/evas/engines/fb/evas_fb.h diff --git a/legacy/evas/src/modules/engines/fb/evas_fb_main.c b/src/modules/evas/engines/fb/evas_fb_main.c similarity index 99% rename from legacy/evas/src/modules/engines/fb/evas_fb_main.c rename to src/modules/evas/engines/fb/evas_fb_main.c index 1d61f1a71a..5cf2ac488a 100644 --- a/legacy/evas/src/modules/engines/fb/evas_fb_main.c +++ b/src/modules/evas/engines/fb/evas_fb_main.c @@ -446,7 +446,7 @@ fb_setvt(int vtno) */ void -fb_init(int vt __UNUSED__, int device) +fb_init(int vt EINA_UNUSED, int device) { char dev[32]; diff --git a/legacy/evas/src/modules/engines/fb/evas_outbuf.c b/src/modules/evas/engines/fb/evas_outbuf.c similarity index 100% rename from legacy/evas/src/modules/engines/fb/evas_outbuf.c rename to src/modules/evas/engines/fb/evas_outbuf.c diff --git a/legacy/evas/src/modules/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h b/src/modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h rename to src/modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h diff --git a/legacy/evas/src/modules/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c similarity index 92% rename from legacy/evas/src/modules/engines/gl_cocoa/evas_engine.c rename to src/modules/evas/engines/gl_cocoa/evas_engine.c index 7a28dd4b5d..73c245f43c 100644 --- a/legacy/evas/src/modules/engines/gl_cocoa/evas_engine.c +++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c @@ -61,7 +61,7 @@ static Evas_GL_API gl_funcs; static void * -eng_info(Evas *e __UNUSED__) +eng_info(Evas *e EINA_UNUSED) { Evas_Engine_Info_GL_Cocoa *info; info = calloc(1, sizeof(Evas_Engine_Info_GL_Cocoa)); @@ -72,7 +72,7 @@ eng_info(Evas *e __UNUSED__) } static void -eng_info_free(Evas *e __UNUSED__, void *info) +eng_info_free(Evas *e EINA_UNUSED, void *info) { Evas_Engine_Info_GL_Cocoa *in; @@ -171,7 +171,7 @@ eng_output_resize(void *data, int w, int h) } static void -eng_output_tile_size_set(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__) +eng_output_tile_size_set(void *data EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) { DBG("tile size set"); } @@ -212,7 +212,7 @@ eng_output_redraws_rect_add(void *data, int x, int y, int w, int h) } static void -eng_output_redraws_rect_del(void *data __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +eng_output_redraws_rect_del(void *data EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) { } @@ -278,7 +278,7 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i } static void -eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +eng_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) { Render_Engine *re; @@ -309,18 +309,18 @@ eng_output_flush(void *data) } static void -eng_output_idle_flush(void *data __UNUSED__) +eng_output_idle_flush(void *data EINA_UNUSED) { } static void -eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h) +eng_context_cutout_add(void *data EINA_UNUSED, void *context, int x, int y, int w, int h) { evas_common_draw_context_add_cutout(context, x, y, w, h); } static void -eng_context_cutout_clear(void *data __UNUSED__, void *context) +eng_context_cutout_clear(void *data EINA_UNUSED, void *context) { evas_common_draw_context_clear_cutouts(context); } @@ -350,7 +350,7 @@ eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, } static void * -eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y) +eng_polygon_point_add(void *data, void *context EINA_UNUSED, void *polygon, int x, int y) { Render_Engine *re; @@ -359,7 +359,7 @@ eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x } static void * -eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon) +eng_polygon_points_clear(void *data, void *context EINA_UNUSED, void *polygon) { Render_Engine *re; @@ -368,7 +368,7 @@ eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon) } static void -eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *polygon, int x, int y) +eng_polygon_draw(void *data, void *context, void *surface EINA_UNUSED, void *polygon, int x, int y) { Render_Engine *re; @@ -380,7 +380,7 @@ eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *poly } static int -eng_image_alpha_get(void *data __UNUSED__, void *image) +eng_image_alpha_get(void *data EINA_UNUSED, void *image) { // Render_Engine *re; Evas_GL_Image *im; @@ -392,7 +392,7 @@ eng_image_alpha_get(void *data __UNUSED__, void *image) } static int -eng_image_colorspace_get(void *data __UNUSED__, void *image) +eng_image_colorspace_get(void *data EINA_UNUSED, void *image) { // Render_Engine *re; Evas_GL_Image *im; @@ -404,7 +404,7 @@ eng_image_colorspace_get(void *data __UNUSED__, void *image) } static void -eng_image_mask_create(void *data __UNUSED__, void *image) +eng_image_mask_create(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im; @@ -466,7 +466,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha) } static void * -eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__) +eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED) { // Render_Engine *re; // @@ -475,7 +475,7 @@ eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r } static void -eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) +eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED) { // Render_Engine *re; // @@ -483,7 +483,7 @@ eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNU } static char * -eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) +eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key EINA_UNUSED) { // Render_Engine *re; Evas_GL_Image *im; @@ -496,7 +496,7 @@ eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) } static char * -eng_image_format_get(void *data __UNUSED__, void *image) +eng_image_format_get(void *data EINA_UNUSED, void *image) { // Render_Engine *re; Evas_GL_Image *im; @@ -646,7 +646,7 @@ eng_image_free(void *data, void *image) } static void -eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h) +eng_image_size_get(void *data EINA_UNUSED, void *image, int *w, int *h) { if (!image) { @@ -874,7 +874,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data) } static void -eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target) { Evas_GL_Image *gim = image; RGBA_Image *im; @@ -887,7 +887,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t } static void -eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target) { Evas_GL_Image *gim = image; RGBA_Image *im; @@ -916,13 +916,13 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, } static void -eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint) { if (image) evas_gl_common_image_scale_hint_set(image, hint); } static int -eng_image_scale_hint_get(void *data __UNUSED__, void *image) +eng_image_scale_hint_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE; @@ -930,7 +930,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image) } static void -eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level) +eng_image_map_draw(void *data EINA_UNUSED, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level) { Evas_GL_Image *gim = image; Render_Engine *re; @@ -981,7 +981,7 @@ eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *im } static void * -eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) +eng_image_map_surface_new(void *data EINA_UNUSED, int w, int h, int alpha) { Render_Engine *re; @@ -990,19 +990,19 @@ eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) } static void -eng_image_map_surface_free(void *data __UNUSED__, void *surface) +eng_image_map_surface_free(void *data EINA_UNUSED, void *surface) { evas_gl_common_image_free(surface); } static void -eng_image_content_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_content_hint_set(void *data EINA_UNUSED, void *image, int hint) { if (image) evas_gl_common_image_content_hint_set(image, hint); } static int -eng_image_content_hint_get(void *data __UNUSED__, void *image) +eng_image_content_hint_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; if (!gim) return EVAS_IMAGE_CONTENT_HINT_NONE; @@ -1010,7 +1010,7 @@ eng_image_content_hint_get(void *data __UNUSED__, void *image) } static void -eng_image_cache_flush(void *data __UNUSED__) +eng_image_cache_flush(void *data EINA_UNUSED) { Render_Engine *re; int tmp_size; @@ -1025,7 +1025,7 @@ eng_image_cache_flush(void *data __UNUSED__) } static void -eng_image_cache_set(void *data __UNUSED__, int bytes) +eng_image_cache_set(void *data EINA_UNUSED, int bytes) { Render_Engine *re; @@ -1036,7 +1036,7 @@ eng_image_cache_set(void *data __UNUSED__, int bytes) } static int -eng_image_cache_get(void *data __UNUSED__) +eng_image_cache_get(void *data EINA_UNUSED) { Render_Engine *re; @@ -1046,7 +1046,7 @@ eng_image_cache_get(void *data __UNUSED__) static void -eng_image_stride_get(void *data __UNUSED__, void *image, int *stride) +eng_image_stride_get(void *data EINA_UNUSED, void *image, int *stride) { Evas_GL_Image *im = image; *stride = im->w * 4; @@ -1058,7 +1058,7 @@ eng_image_stride_get(void *data __UNUSED__, void *image, int *stride) } static void -eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props) +eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props) { Render_Engine *re; @@ -1091,7 +1091,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int static Eina_Bool -eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__) +eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED) { // FIXME: support ARGB gl targets!!! return EINA_FALSE; @@ -1348,7 +1348,7 @@ eng_gl_api_get(void *data) } static int -eng_image_load_error_get(void *data __UNUSED__, void *image) +eng_image_load_error_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im; diff --git a/legacy/evas/src/modules/engines/gl_cocoa/evas_engine.h b/src/modules/evas/engines/gl_cocoa/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_cocoa/evas_engine.h rename to src/modules/evas/engines/gl_cocoa/evas_engine.h diff --git a/legacy/evas/src/modules/engines/gl_cocoa/evas_gl_cocoa_main.m b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m similarity index 100% rename from legacy/evas/src/modules/engines/gl_cocoa/evas_gl_cocoa_main.m rename to src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_api.c rename to src/modules/evas/engines/gl_common/evas_gl_api.c diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.c b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.c rename to src/modules/evas/engines/gl_common/evas_gl_api_ext.c diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.h b/src/modules/evas/engines/gl_common/evas_gl_api_ext.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.h rename to src/modules/evas/engines/gl_common/evas_gl_api_ext.h diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext_def.h b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext_def.h rename to src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_common.h rename to src/modules/evas/engines/gl_common/evas_gl_common.h diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c similarity index 99% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_context.c rename to src/modules/evas/engines/gl_common/evas_gl_context.c index 38115fc7f8..6858bc65fc 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -1147,7 +1147,7 @@ vertex_array_size_check(Evas_Engine_GL_Context *gc, int pn, int n) } static inline Evas_GL_Shader -evas_gl_common_shader_choice(int npoints __UNUSED__, +evas_gl_common_shader_choice(int npoints EINA_UNUSED, RGBA_Map_Point *p, int r, int g, int b, int a, Evas_GL_Shader nomul, @@ -2364,7 +2364,7 @@ evas_gl_common_context_flush(Evas_Engine_GL_Context *gc) } static void -scissor_rot(Evas_Engine_GL_Context *gc __UNUSED__, +scissor_rot(Evas_Engine_GL_Context *gc EINA_UNUSED, int rot, int gw, int gh, int cx, int cy, int cw, int ch) { switch (rot) diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.c b/src/modules/evas/engines/gl_common/evas_gl_core.c similarity index 99% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_core.c rename to src/modules/evas/engines/gl_common/evas_gl_core.c index 6019a6a82d..3656eaf253 100755 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.c +++ b/src/modules/evas/engines/gl_common/evas_gl_core.c @@ -1465,7 +1465,7 @@ evgl_make_current(EVGL_Engine *ee, EVGL_Surface *sfc, EVGL_Context *ctx) } const char * -evgl_string_query(EVGL_Engine *ee __UNUSED__, int name) +evgl_string_query(EVGL_Engine *ee EINA_UNUSED, int name) { switch(name) { @@ -1477,7 +1477,7 @@ evgl_string_query(EVGL_Engine *ee __UNUSED__, int name) } void * -evgl_proc_address_get(const char *name __UNUSED__) +evgl_proc_address_get(const char *name EINA_UNUSED) { // Will eventually deprecate this function return NULL; diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.h b/src/modules/evas/engines/gl_common/evas_gl_core.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_core.h rename to src/modules/evas/engines/gl_common/evas_gl_core.h diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_core_private.h b/src/modules/evas/engines/gl_common/evas_gl_core_private.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_core_private.h rename to src/modules/evas/engines/gl_common/evas_gl_core_private.h diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_filter.c b/src/modules/evas/engines/gl_common/evas_gl_filter.c similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_filter.c rename to src/modules/evas/engines/gl_common/evas_gl_filter.c diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_font.c b/src/modules/evas/engines/gl_common/evas_gl_font.c similarity index 98% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_font.c rename to src/modules/evas/engines/gl_common/evas_gl_font.c index d3b4ba443f..2aaa86ac17 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_font.c +++ b/src/modules/evas/engines/gl_common/evas_gl_font.c @@ -100,7 +100,7 @@ evas_gl_font_texture_free(void *tex) } void -evas_gl_font_texture_draw(void *context, void *surface __UNUSED__, void *draw_context, RGBA_Font_Glyph *fg, int x, int y) +evas_gl_font_texture_draw(void *context, void *surface EINA_UNUSED, void *draw_context, RGBA_Font_Glyph *fg, int x, int y) { Evas_Engine_GL_Context *gc = context; RGBA_Draw_Context *dc = draw_context; diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c similarity index 99% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_image.c rename to src/modules/evas/engines/gl_common/evas_gl_image.c index ea95ca7964..404cb13806 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_image.c +++ b/src/modules/evas/engines/gl_common/evas_gl_image.c @@ -661,7 +661,7 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im) void evas_gl_common_image_map_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, - int npoints, RGBA_Map_Point *p, int smooth, int level __UNUSED__) + int npoints, RGBA_Map_Point *p, int smooth, int level EINA_UNUSED) { RGBA_Draw_Context *dc; int r, g, b, a; diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_line.c b/src/modules/evas/engines/gl_common/evas_gl_line.c similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_line.c rename to src/modules/evas/engines/gl_common/evas_gl_line.c diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_polygon.c b/src/modules/evas/engines/gl_common/evas_gl_polygon.c similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_polygon.c rename to src/modules/evas/engines/gl_common/evas_gl_polygon.c diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_private.h b/src/modules/evas/engines/gl_common/evas_gl_private.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_private.h rename to src/modules/evas/engines/gl_common/evas_gl_private.h diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_rectangle.c b/src/modules/evas/engines/gl_common/evas_gl_rectangle.c similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_rectangle.c rename to src/modules/evas/engines/gl_common/evas_gl_rectangle.c diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_shader.c rename to src/modules/evas/engines/gl_common/evas_gl_shader.c diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c similarity index 99% rename from legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c rename to src/modules/evas/engines/gl_common/evas_gl_texture.c index b19191a89a..5dd14e8e4c 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c +++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c @@ -194,7 +194,7 @@ _pool_tex_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, GLenum fo } static int -_pool_tex_alloc(Evas_GL_Texture_Pool *pt, int w, int h __UNUSED__, int *u, int *v, Eina_List **l_after) +_pool_tex_alloc(Evas_GL_Texture_Pool *pt, int w, int h EINA_UNUSED, int *u, int *v, Eina_List **l_after) { Eina_List *l; Evas_GL_Texture *tex, *tex2; @@ -1039,7 +1039,7 @@ evas_gl_common_texture_alpha_new(Evas_Engine_GL_Context *gc, DATA8 *pixels, void evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels, - unsigned int w, unsigned int h, int fh __UNUSED__) + unsigned int w, unsigned int h, int fh EINA_UNUSED) { if (!tex->pt) return; glBindTexture(GL_TEXTURE_2D, tex->pt->texture); diff --git a/legacy/evas/src/modules/engines/gl_common/shader/.gitignore b/src/modules/evas/engines/gl_common/shader/.gitignore similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/.gitignore rename to src/modules/evas/engines/gl_common/shader/.gitignore diff --git a/legacy/evas/src/modules/engines/gl_common/shader/compile.sh b/src/modules/evas/engines/gl_common/shader/compile.sh similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/compile.sh rename to src/modules/evas/engines/gl_common/shader/compile.sh diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.h b/src/modules/evas/engines/gl_common/shader/filter_blur.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur.h rename to src/modules/evas/engines/gl_common/shader/filter_blur.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.shd b/src/modules/evas/engines/gl_common/shader/filter_blur.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur.shd rename to src/modules/evas/engines/gl_common/shader/filter_blur.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h rename to src/modules/evas/engines/gl_common/shader/filter_blur_bgra.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.shd b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.shd rename to src/modules/evas/engines/gl_common/shader/filter_blur_bgra.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h rename to src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.shd rename to src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_blur_nomul.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h rename to src/modules/evas/engines/gl_common/shader/filter_blur_nomul.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_blur_nomul.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.shd rename to src/modules/evas/engines/gl_common/shader/filter_blur_nomul.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.h b/src/modules/evas/engines/gl_common/shader/filter_blur_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.h rename to src/modules/evas/engines/gl_common/shader/filter_blur_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.shd b/src/modules/evas/engines/gl_common/shader/filter_blur_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.shd rename to src/modules/evas/engines/gl_common/shader/filter_blur_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.h b/src/modules/evas/engines/gl_common/shader/filter_greyscale.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.h rename to src/modules/evas/engines/gl_common/shader/filter_greyscale.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.shd b/src/modules/evas/engines/gl_common/shader/filter_greyscale.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.shd rename to src/modules/evas/engines/gl_common/shader/filter_greyscale.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h rename to src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.shd b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.shd rename to src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h rename to src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd rename to src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h rename to src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.shd rename to src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.h b/src/modules/evas/engines/gl_common/shader/filter_invert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_invert.h rename to src/modules/evas/engines/gl_common/shader/filter_invert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.shd b/src/modules/evas/engines/gl_common/shader/filter_invert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_invert.shd rename to src/modules/evas/engines/gl_common/shader/filter_invert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h rename to src/modules/evas/engines/gl_common/shader/filter_invert_bgra.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.shd b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.shd rename to src/modules/evas/engines/gl_common/shader/filter_invert_bgra.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h rename to src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.shd rename to src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_invert_nomul.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h rename to src/modules/evas/engines/gl_common/shader/filter_invert_nomul.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_invert_nomul.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.shd rename to src/modules/evas/engines/gl_common/shader/filter_invert_nomul.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.h b/src/modules/evas/engines/gl_common/shader/filter_sepia.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.h rename to src/modules/evas/engines/gl_common/shader/filter_sepia.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.shd b/src/modules/evas/engines/gl_common/shader/filter_sepia.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.shd rename to src/modules/evas/engines/gl_common/shader/filter_sepia.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h rename to src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.shd b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.shd rename to src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h rename to src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.shd rename to src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h rename to src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.shd rename to src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/font_frag.h b/src/modules/evas/engines/gl_common/shader/font_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/font_frag.h rename to src/modules/evas/engines/gl_common/shader/font_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/font_frag.shd b/src/modules/evas/engines/gl_common/shader/font_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/font_frag.shd rename to src/modules/evas/engines/gl_common/shader/font_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/font_vert.h b/src/modules/evas/engines/gl_common/shader/font_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/font_vert.h rename to src/modules/evas/engines/gl_common/shader/font_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/font_vert.shd b/src/modules/evas/engines/gl_common/shader/font_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/font_vert.shd rename to src/modules/evas/engines/gl_common/shader/font_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.h b/src/modules/evas/engines/gl_common/shader/img_bgra_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.h rename to src/modules/evas/engines/gl_common/shader/img_bgra_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.shd b/src/modules/evas/engines/gl_common/shader/img_bgra_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.shd rename to src/modules/evas/engines/gl_common/shader/img_bgra_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.h rename to src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.shd rename to src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.h rename to src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.shd rename to src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.h b/src/modules/evas/engines/gl_common/shader/img_bgra_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.h rename to src/modules/evas/engines/gl_common/shader/img_bgra_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.shd b/src/modules/evas/engines/gl_common/shader/img_bgra_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.shd rename to src/modules/evas/engines/gl_common/shader/img_bgra_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_frag.h b/src/modules/evas/engines/gl_common/shader/img_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_frag.h rename to src/modules/evas/engines/gl_common/shader/img_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_frag.shd b/src/modules/evas/engines/gl_common/shader/img_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_frag.shd rename to src/modules/evas/engines/gl_common/shader/img_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.h b/src/modules/evas/engines/gl_common/shader/img_mask_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.h rename to src/modules/evas/engines/gl_common/shader/img_mask_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.shd b/src/modules/evas/engines/gl_common/shader/img_mask_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.shd rename to src/modules/evas/engines/gl_common/shader/img_mask_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.h b/src/modules/evas/engines/gl_common/shader/img_mask_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.h rename to src/modules/evas/engines/gl_common/shader/img_mask_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.shd b/src/modules/evas/engines/gl_common/shader/img_mask_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.shd rename to src/modules/evas/engines/gl_common/shader/img_mask_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/img_nomul_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.h rename to src/modules/evas/engines/gl_common/shader/img_nomul_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/img_nomul_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.shd rename to src/modules/evas/engines/gl_common/shader/img_nomul_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/img_nomul_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.h rename to src/modules/evas/engines/gl_common/shader/img_nomul_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_nomul_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.shd rename to src/modules/evas/engines/gl_common/shader/img_nomul_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_vert.h b/src/modules/evas/engines/gl_common/shader/img_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_vert.h rename to src/modules/evas/engines/gl_common/shader/img_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_vert.shd b/src/modules/evas/engines/gl_common/shader/img_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/img_vert.shd rename to src/modules/evas/engines/gl_common/shader/img_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/make-c-str.sh b/src/modules/evas/engines/gl_common/shader/make-c-str.sh similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/make-c-str.sh rename to src/modules/evas/engines/gl_common/shader/make-c-str.sh diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.h b/src/modules/evas/engines/gl_common/shader/nv12_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.h rename to src/modules/evas/engines/gl_common/shader/nv12_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.shd b/src/modules/evas/engines/gl_common/shader/nv12_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.shd rename to src/modules/evas/engines/gl_common/shader/nv12_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h rename to src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.shd rename to src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h rename to src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd rename to src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h b/src/modules/evas/engines/gl_common/shader/nv12_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h rename to src/modules/evas/engines/gl_common/shader/nv12_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd b/src/modules/evas/engines/gl_common/shader/nv12_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd rename to src/modules/evas/engines/gl_common/shader/nv12_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/rect_frag.h b/src/modules/evas/engines/gl_common/shader/rect_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/rect_frag.h rename to src/modules/evas/engines/gl_common/shader/rect_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/rect_frag.shd b/src/modules/evas/engines/gl_common/shader/rect_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/rect_frag.shd rename to src/modules/evas/engines/gl_common/shader/rect_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/rect_vert.h b/src/modules/evas/engines/gl_common/shader/rect_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/rect_vert.h rename to src/modules/evas/engines/gl_common/shader/rect_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/rect_vert.shd b/src/modules/evas/engines/gl_common/shader/rect_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/rect_vert.shd rename to src/modules/evas/engines/gl_common/shader/rect_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_frag.h b/src/modules/evas/engines/gl_common/shader/tex_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/tex_frag.h rename to src/modules/evas/engines/gl_common/shader/tex_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_frag.shd b/src/modules/evas/engines/gl_common/shader/tex_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/tex_frag.shd rename to src/modules/evas/engines/gl_common/shader/tex_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/tex_nomul_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.h rename to src/modules/evas/engines/gl_common/shader/tex_nomul_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/tex_nomul_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.shd rename to src/modules/evas/engines/gl_common/shader/tex_nomul_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/tex_nomul_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.h rename to src/modules/evas/engines/gl_common/shader/tex_nomul_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_nomul_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.shd rename to src/modules/evas/engines/gl_common/shader/tex_nomul_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_vert.h b/src/modules/evas/engines/gl_common/shader/tex_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/tex_vert.h rename to src/modules/evas/engines/gl_common/shader/tex_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/tex_vert.shd rename to src/modules/evas/engines/gl_common/shader/tex_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h b/src/modules/evas/engines/gl_common/shader/yuv_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h rename to src/modules/evas/engines/gl_common/shader/yuv_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd b/src/modules/evas/engines/gl_common/shader/yuv_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd rename to src/modules/evas/engines/gl_common/shader/yuv_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h rename to src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd rename to src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h rename to src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd rename to src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h b/src/modules/evas/engines/gl_common/shader/yuv_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h rename to src/modules/evas/engines/gl_common/shader/yuv_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd b/src/modules/evas/engines/gl_common/shader/yuv_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd rename to src/modules/evas/engines/gl_common/shader/yuv_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.h b/src/modules/evas/engines/gl_common/shader/yuy2_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.h rename to src/modules/evas/engines/gl_common/shader/yuy2_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.shd b/src/modules/evas/engines/gl_common/shader/yuy2_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.shd rename to src/modules/evas/engines/gl_common/shader/yuy2_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h rename to src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.shd rename to src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/yuy2_nomul_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h rename to src/modules/evas/engines/gl_common/shader/yuy2_nomul_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/yuy2_nomul_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.shd rename to src/modules/evas/engines/gl_common/shader/yuy2_nomul_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.h b/src/modules/evas/engines/gl_common/shader/yuy2_vert.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.h rename to src/modules/evas/engines/gl_common/shader/yuy2_vert.h diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.shd b/src/modules/evas/engines/gl_common/shader/yuy2_vert.shd similarity index 100% rename from legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.shd rename to src/modules/evas/engines/gl_common/shader/yuy2_vert.shd diff --git a/legacy/evas/src/modules/engines/gl_sdl/Evas_Engine_GL_SDL.h b/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_sdl/Evas_Engine_GL_SDL.h rename to src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h diff --git a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c similarity index 94% rename from legacy/evas/src/modules/engines/gl_sdl/evas_engine.c rename to src/modules/evas/engines/gl_sdl/evas_engine.c index 06cf555340..f49fcb8d8d 100644 --- a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c +++ b/src/modules/evas/engines/gl_sdl/evas_engine.c @@ -20,7 +20,7 @@ eng_info(Evas *e) } static void -eng_info_free(Evas *e __UNUSED__, void *info) +eng_info_free(Evas *e EINA_UNUSED, void *info) { Evas_Engine_Info_GL_SDL *in; in = (Evas_Engine_Info_GL_SDL *)info; @@ -105,7 +105,7 @@ eng_output_resize(void *data, int w, int h) } static void -eng_output_tile_size_set(void *data, int w __UNUSED__, int h __UNUSED__) +eng_output_tile_size_set(void *data, int w EINA_UNUSED, int h EINA_UNUSED) { // Render_Engine *re; // @@ -145,7 +145,7 @@ eng_output_redraws_rect_add(void *data, int x, int y, int w, int h) } static void -eng_output_redraws_rect_del(void *data, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +eng_output_redraws_rect_del(void *data, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) { // Render_Engine *re; // @@ -222,7 +222,7 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i } static void -eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +eng_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) { Render_Engine *re; @@ -318,7 +318,7 @@ eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, } static void * -eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y) +eng_polygon_point_add(void *data, void *context EINA_UNUSED, void *polygon, int x, int y) { Render_Engine *re; @@ -327,7 +327,7 @@ eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x } static void * -eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon) +eng_polygon_points_clear(void *data, void *context EINA_UNUSED, void *polygon) { Render_Engine *re; @@ -408,7 +408,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha) } static void * -eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__) +eng_image_border_set(void *data, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED) { // Render_Engine *re; // @@ -417,7 +417,7 @@ eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__ } static void -eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) +eng_image_border_get(void *data, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED) { // Render_Engine *re; // @@ -425,7 +425,7 @@ eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int } static char * -eng_image_comment_get(void *data, void *image, char *key __UNUSED__) +eng_image_comment_get(void *data, void *image, char *key EINA_UNUSED) { // Render_Engine *re; Evas_GL_Image *im; @@ -779,7 +779,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data) } static void -eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target) { Evas_GL_Image *gim = image; RGBA_Image *im; @@ -792,7 +792,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t } static void -eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target) { Evas_GL_Image *gim = image; RGBA_Image *im; @@ -820,13 +820,13 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, } static void -eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint) { if (image) evas_gl_common_image_scale_hint_set(image, hint); } static void -eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level) +eng_image_map_draw(void *data EINA_UNUSED, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level) { Evas_GL_Image *gim = image; Render_Engine *re; @@ -875,7 +875,7 @@ eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *im } static void * -eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) +eng_image_map_surface_new(void *data EINA_UNUSED, int w, int h, int alpha) { Render_Engine *re; @@ -884,13 +884,13 @@ eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) } static void -eng_image_map_surface_free(void *data __UNUSED__, void *surface) +eng_image_map_surface_free(void *data EINA_UNUSED, void *surface) { evas_gl_common_image_free(surface); } static int -eng_image_scale_hint_get(void *data __UNUSED__, void *image) +eng_image_scale_hint_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE; @@ -898,7 +898,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image) } static void -eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props) +eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props) { Render_Engine *re; @@ -929,14 +929,14 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int } static Eina_Bool -eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__) +eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED) { // FIXME: support ARGB gl targets!!! return EINA_FALSE; } static int -eng_image_load_error_get(void *data __UNUSED__, void *image) +eng_image_load_error_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im; diff --git a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.h b/src/modules/evas/engines/gl_sdl/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_sdl/evas_engine.h rename to src/modules/evas/engines/gl_sdl/evas_engine.h diff --git a/legacy/evas/src/modules/engines/gl_x11/Evas_Engine_GL_X11.h b/src/modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_x11/Evas_Engine_GL_X11.h rename to src/modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c similarity index 96% rename from legacy/evas/src/modules/engines/gl_x11/evas_engine.c rename to src/modules/evas/engines/gl_x11/evas_engine.c index e9a529d0e3..454100a553 100644 --- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -607,7 +607,7 @@ eng_info(Evas *eo_e) } static void -eng_info_free(Evas *eo_e __UNUSED__, void *info) +eng_info_free(Evas *eo_e EINA_UNUSED, void *info) { Evas_Engine_Info_GL_X11 *in; // dont free! why bother? its not worth it @@ -1134,7 +1134,7 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i static int safe_native = -1; static void -eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +eng_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) { Render_Engine *re; @@ -1283,7 +1283,7 @@ eng_output_dump(void *data) } static void -eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h) +eng_context_cutout_add(void *data EINA_UNUSED, void *context, int x, int y, int w, int h) { // Render_Engine *re; // @@ -1293,7 +1293,7 @@ eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w } static void -eng_context_cutout_clear(void *data __UNUSED__, void *context) +eng_context_cutout_clear(void *data EINA_UNUSED, void *context) { // Render_Engine *re; // @@ -1327,7 +1327,7 @@ eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, } static void * -eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y) +eng_polygon_point_add(void *data, void *context EINA_UNUSED, void *polygon, int x, int y) { Render_Engine *re; @@ -1337,7 +1337,7 @@ eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x } static void * -eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon) +eng_polygon_points_clear(void *data, void *context EINA_UNUSED, void *polygon) { Render_Engine *re; @@ -1347,7 +1347,7 @@ eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon) } static void -eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *polygon, int x, int y) +eng_polygon_draw(void *data, void *context, void *surface EINA_UNUSED, void *polygon, int x, int y) { Render_Engine *re; @@ -1359,7 +1359,7 @@ eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *poly } static int -eng_image_alpha_get(void *data __UNUSED__, void *image) +eng_image_alpha_get(void *data EINA_UNUSED, void *image) { // Render_Engine *re; Evas_GL_Image *im; @@ -1371,7 +1371,7 @@ eng_image_alpha_get(void *data __UNUSED__, void *image) } static int -eng_image_colorspace_get(void *data __UNUSED__, void *image) +eng_image_colorspace_get(void *data EINA_UNUSED, void *image) { // Render_Engine *re; Evas_GL_Image *im; @@ -1383,7 +1383,7 @@ eng_image_colorspace_get(void *data __UNUSED__, void *image) } static void -eng_image_mask_create(void *data __UNUSED__, void *image) +eng_image_mask_create(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im; @@ -1445,7 +1445,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha) } static void * -eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__) +eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED) { // Render_Engine *re; // @@ -1454,7 +1454,7 @@ eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r } static void -eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) +eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED) { // Render_Engine *re; // @@ -1462,7 +1462,7 @@ eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNU } static char * -eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) +eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key EINA_UNUSED) { // Render_Engine *re; Evas_GL_Image *im; @@ -1475,7 +1475,7 @@ eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) } static char * -eng_image_format_get(void *data __UNUSED__, void *image) +eng_image_format_get(void *data EINA_UNUSED, void *image) { // Render_Engine *re; Evas_GL_Image *im; @@ -2029,7 +2029,7 @@ eng_image_native_set(void *data, void *image, void *native) } static void * -eng_image_native_get(void *data __UNUSED__, void *image) +eng_image_native_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im = image; Native *n; @@ -2121,7 +2121,7 @@ eng_image_free(void *data, void *image) } static void -eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h) +eng_image_size_get(void *data EINA_UNUSED, void *image, int *w, int *h) { if (!image) { @@ -2394,7 +2394,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data) } static void -eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target) { Evas_GL_Image *gim = image; RGBA_Image *im; @@ -2407,7 +2407,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t } static void -eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target) { Evas_GL_Image *gim = image; RGBA_Image *im; @@ -2446,13 +2446,13 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, } static void -eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint) { if (image) evas_gl_common_image_scale_hint_set(image, hint); } static int -eng_image_scale_hint_get(void *data __UNUSED__, void *image) +eng_image_scale_hint_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE; @@ -2511,7 +2511,7 @@ eng_image_map_draw(void *data, void *context, void *surface, void *image, RGBA_M } static void -eng_image_map_clean(void *data __UNUSED__, RGBA_Map *m __UNUSED__) +eng_image_map_clean(void *data EINA_UNUSED, RGBA_Map *m EINA_UNUSED) { } @@ -2525,19 +2525,19 @@ eng_image_map_surface_new(void *data, int w, int h, int alpha) } static void -eng_image_map_surface_free(void *data __UNUSED__, void *surface) +eng_image_map_surface_free(void *data EINA_UNUSED, void *surface) { evas_gl_common_image_free(surface); } static void -eng_image_content_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_content_hint_set(void *data EINA_UNUSED, void *image, int hint) { if (image) evas_gl_common_image_content_hint_set(image, hint); } static int -eng_image_content_hint_get(void *data __UNUSED__, void *image) +eng_image_content_hint_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; if (!gim) return EVAS_IMAGE_CONTENT_HINT_NONE; @@ -2571,13 +2571,13 @@ eng_image_cache_set(void *data, int bytes) } static int -eng_image_cache_get(void *data __UNUSED__) +eng_image_cache_get(void *data EINA_UNUSED) { return evas_common_image_get_cache(); } static void -eng_image_stride_get(void *data __UNUSED__, void *image, int *stride) +eng_image_stride_get(void *data EINA_UNUSED, void *image, int *stride) { Evas_GL_Image *im = image; @@ -2588,7 +2588,7 @@ eng_image_stride_get(void *data __UNUSED__, void *image, int *stride) } static void -eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UNUSED__, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props) +eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font EINA_UNUSED, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props) { Render_Engine *re; @@ -2621,7 +2621,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UN } static Eina_Bool -eng_canvas_alpha_get(void *data, void *info __UNUSED__) +eng_canvas_alpha_get(void *data, void *info EINA_UNUSED) { Render_Engine *re = (Render_Engine *)data; return re->win->alpha; @@ -2665,7 +2665,7 @@ eng_gl_context_destroy(void *data, void *context) } static int -eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) +eng_gl_make_current(void *data EINA_UNUSED, void *surface, void *context) { Render_Engine *re = (Render_Engine *)data; EVGL_Surface *sfc = (EVGL_Surface *)surface; @@ -2675,7 +2675,7 @@ eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) } static void * -eng_gl_string_query(void *data __UNUSED__, int name) +eng_gl_string_query(void *data EINA_UNUSED, int name) { Render_Engine *re = (Render_Engine *)data; @@ -2684,13 +2684,13 @@ eng_gl_string_query(void *data __UNUSED__, int name) // Need to deprecate this function.. static void * -eng_gl_proc_address_get(void *data __UNUSED__, const char *name __UNUSED__) +eng_gl_proc_address_get(void *data EINA_UNUSED, const char *name EINA_UNUSED) { return NULL; } static int -eng_gl_native_surface_get(void *data __UNUSED__, void *surface, void *native_surface) +eng_gl_native_surface_get(void *data EINA_UNUSED, void *surface, void *native_surface) { Render_Engine *re = (Render_Engine *)data; EVGL_Surface *sfc = (EVGL_Surface *)surface; @@ -2700,7 +2700,7 @@ eng_gl_native_surface_get(void *data __UNUSED__, void *surface, void *native_sur } static void * -eng_gl_api_get(void *data __UNUSED__) +eng_gl_api_get(void *data EINA_UNUSED) { Render_Engine *re = (Render_Engine *)data; @@ -2727,7 +2727,7 @@ eng_gl_img_obj_set(void *data, void *image, int has_alpha) //--------------------------------// static int -eng_image_load_error_get(void *data __UNUSED__, void *image) +eng_image_load_error_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im; @@ -2737,7 +2737,7 @@ eng_image_load_error_get(void *data __UNUSED__, void *image) } static Eina_Bool -eng_image_animated_get(void *data __UNUSED__, void *image) +eng_image_animated_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -2750,7 +2750,7 @@ eng_image_animated_get(void *data __UNUSED__, void *image) } static int -eng_image_animated_frame_count_get(void *data __UNUSED__, void *image) +eng_image_animated_frame_count_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -2764,7 +2764,7 @@ eng_image_animated_frame_count_get(void *data __UNUSED__, void *image) } static Evas_Image_Animated_Loop_Hint -eng_image_animated_loop_type_get(void *data __UNUSED__, void *image) +eng_image_animated_loop_type_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -2778,7 +2778,7 @@ eng_image_animated_loop_type_get(void *data __UNUSED__, void *image) } static int -eng_image_animated_loop_count_get(void *data __UNUSED__, void *image) +eng_image_animated_loop_count_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -2792,7 +2792,7 @@ eng_image_animated_loop_count_get(void *data __UNUSED__, void *image) } static double -eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int start_frame, int frame_num) +eng_image_animated_frame_duration_get(void *data EINA_UNUSED, void *image, int start_frame, int frame_num) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -2806,7 +2806,7 @@ eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int st } static Eina_Bool -eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index) +eng_image_animated_frame_set(void *data EINA_UNUSED, void *image, int frame_index) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -2823,7 +2823,7 @@ eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index } static Eina_Bool -eng_image_can_region_get(void *data __UNUSED__, void *image) +eng_image_can_region_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -2970,7 +2970,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_engine_GL_X11_log_dom); evas_gl_common_module_close(); diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.h b/src/modules/evas/engines/gl_x11/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/gl_x11/evas_engine.h rename to src/modules/evas/engines/gl_x11/evas_engine.h diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c b/src/modules/evas/engines/gl_x11/evas_x_main.c similarity index 100% rename from legacy/evas/src/modules/engines/gl_x11/evas_x_main.c rename to src/modules/evas/engines/gl_x11/evas_x_main.c diff --git a/legacy/evas/src/modules/engines/psl1ght/Evas_Engine_PSL1GHT.h b/src/modules/evas/engines/psl1ght/Evas_Engine_PSL1GHT.h similarity index 100% rename from legacy/evas/src/modules/engines/psl1ght/Evas_Engine_PSL1GHT.h rename to src/modules/evas/engines/psl1ght/Evas_Engine_PSL1GHT.h diff --git a/legacy/evas/src/modules/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c similarity index 98% rename from legacy/evas/src/modules/engines/psl1ght/evas_engine.c rename to src/modules/evas/engines/psl1ght/evas_engine.c index 463b2dd892..64fe8ea863 100644 --- a/legacy/evas/src/modules/engines/psl1ght/evas_engine.c +++ b/src/modules/evas/engines/psl1ght/evas_engine.c @@ -153,7 +153,7 @@ eng_info(Evas *e) } static void -eng_info_free(Evas *e __UNUSED__, void *info) +eng_info_free(Evas *e EINA_UNUSED, void *info) { Evas_Engine_Info_PSL1GHT *in; @@ -440,7 +440,7 @@ eng_output_idle_flush(void *data) } static Eina_Bool -eng_canvas_alpha_get(void *data, void *context __UNUSED__) +eng_canvas_alpha_get(void *data, void *context EINA_UNUSED) { Render_Engine *re; @@ -489,7 +489,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_engine_psl1ght_log_dom); } diff --git a/legacy/evas/src/modules/engines/psl1ght/evas_engine.h b/src/modules/evas/engines/psl1ght/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/psl1ght/evas_engine.h rename to src/modules/evas/engines/psl1ght/evas_engine.h diff --git a/legacy/evas/src/modules/engines/psl1ght/rsxutil.c b/src/modules/evas/engines/psl1ght/rsxutil.c similarity index 100% rename from legacy/evas/src/modules/engines/psl1ght/rsxutil.c rename to src/modules/evas/engines/psl1ght/rsxutil.c diff --git a/legacy/evas/src/modules/engines/psl1ght/rsxutil.h b/src/modules/evas/engines/psl1ght/rsxutil.h similarity index 100% rename from legacy/evas/src/modules/engines/psl1ght/rsxutil.h rename to src/modules/evas/engines/psl1ght/rsxutil.h diff --git a/legacy/evas/src/modules/engines/software_ddraw/Evas_Engine_Software_DDraw.h b/src/modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h similarity index 100% rename from legacy/evas/src/modules/engines/software_ddraw/Evas_Engine_Software_DDraw.h rename to src/modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h diff --git a/legacy/evas/src/modules/engines/software_ddraw/evas_ddraw_buffer.c b/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c similarity index 100% rename from legacy/evas/src/modules/engines/software_ddraw/evas_ddraw_buffer.c rename to src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c diff --git a/legacy/evas/src/modules/engines/software_ddraw/evas_ddraw_main.cpp b/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp similarity index 100% rename from legacy/evas/src/modules/engines/software_ddraw/evas_ddraw_main.cpp rename to src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp diff --git a/legacy/evas/src/modules/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c similarity index 100% rename from legacy/evas/src/modules/engines/software_ddraw/evas_engine.c rename to src/modules/evas/engines/software_ddraw/evas_engine.c diff --git a/legacy/evas/src/modules/engines/software_ddraw/evas_engine.h b/src/modules/evas/engines/software_ddraw/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/software_ddraw/evas_engine.h rename to src/modules/evas/engines/software_ddraw/evas_engine.h diff --git a/legacy/evas/src/modules/engines/software_ddraw/evas_outbuf.c b/src/modules/evas/engines/software_ddraw/evas_outbuf.c similarity index 100% rename from legacy/evas/src/modules/engines/software_ddraw/evas_outbuf.c rename to src/modules/evas/engines/software_ddraw/evas_outbuf.c diff --git a/legacy/evas/src/modules/engines/software_gdi/Evas_Engine_Software_Gdi.h b/src/modules/evas/engines/software_gdi/Evas_Engine_Software_Gdi.h similarity index 100% rename from legacy/evas/src/modules/engines/software_gdi/Evas_Engine_Software_Gdi.h rename to src/modules/evas/engines/software_gdi/Evas_Engine_Software_Gdi.h diff --git a/legacy/evas/src/modules/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c similarity index 99% rename from legacy/evas/src/modules/engines/software_gdi/evas_engine.c rename to src/modules/evas/engines/software_gdi/evas_engine.c index 108a08f7ef..8a72b67789 100644 --- a/legacy/evas/src/modules/engines/software_gdi/evas_engine.c +++ b/src/modules/evas/engines/software_gdi/evas_engine.c @@ -93,7 +93,7 @@ _output_setup(int width, /* engine api this module provides */ static void * -eng_info(Evas *e __UNUSED__) +eng_info(Evas *e EINA_UNUSED) { Evas_Engine_Info_Software_Gdi *info; info = calloc(1, sizeof(Evas_Engine_Info_Software_Gdi)); @@ -103,7 +103,7 @@ eng_info(Evas *e __UNUSED__) } static void -eng_info_free(Evas *e __UNUSED__, void *info) +eng_info_free(Evas *e EINA_UNUSED, void *info) { Evas_Engine_Info_Software_Gdi *in; in = (Evas_Engine_Info_Software_Gdi *)info; diff --git a/legacy/evas/src/modules/engines/software_gdi/evas_engine.h b/src/modules/evas/engines/software_gdi/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/software_gdi/evas_engine.h rename to src/modules/evas/engines/software_gdi/evas_engine.h diff --git a/legacy/evas/src/modules/engines/software_gdi/evas_gdi_buffer.c b/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c similarity index 100% rename from legacy/evas/src/modules/engines/software_gdi/evas_gdi_buffer.c rename to src/modules/evas/engines/software_gdi/evas_gdi_buffer.c diff --git a/legacy/evas/src/modules/engines/software_gdi/evas_gdi_main.c b/src/modules/evas/engines/software_gdi/evas_gdi_main.c similarity index 97% rename from legacy/evas/src/modules/engines/software_gdi/evas_gdi_main.c rename to src/modules/evas/engines/software_gdi/evas_gdi_main.c index 4a63959e7e..2880270438 100644 --- a/legacy/evas/src/modules/engines/software_gdi/evas_gdi_main.c +++ b/src/modules/evas/engines/software_gdi/evas_gdi_main.c @@ -6,7 +6,7 @@ int evas_software_gdi_init (HWND window, int depth, unsigned int borderless, - unsigned int fullscreen __UNUSED__, + unsigned int fullscreen EINA_UNUSED, unsigned int region, Outbuf *buf) { diff --git a/legacy/evas/src/modules/engines/software_gdi/evas_outbuf.c b/src/modules/evas/engines/software_gdi/evas_outbuf.c similarity index 99% rename from legacy/evas/src/modules/engines/software_gdi/evas_outbuf.c rename to src/modules/evas/engines/software_gdi/evas_outbuf.c index b0ffdb3f84..87b3048a79 100644 --- a/legacy/evas/src/modules/engines/software_gdi/evas_outbuf.c +++ b/src/modules/evas/engines/software_gdi/evas_outbuf.c @@ -561,8 +561,8 @@ evas_software_gdi_outbuf_push_updated_region(Outbuf *buf, } void -evas_software_gdi_outbuf_free_region_for_update(Outbuf *buf __UNUSED__, - RGBA_Image *update __UNUSED__) +evas_software_gdi_outbuf_free_region_for_update(Outbuf *buf EINA_UNUSED, + RGBA_Image *update EINA_UNUSED) { /* no need to do anything - they are cleaned up on flush */ } diff --git a/legacy/evas/src/modules/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c similarity index 90% rename from legacy/evas/src/modules/engines/software_generic/evas_engine.c rename to src/modules/evas/engines/software_generic/evas_engine.c index 8160fa8ac6..6d140b9f7f 100644 --- a/legacy/evas/src/modules/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -284,44 +284,44 @@ static int cpunum = 0; static int _evas_soft_gen_log_dom = -1; static void -eng_output_dump(void *data __UNUSED__) +eng_output_dump(void *data EINA_UNUSED) { evas_common_image_image_all_unload(); evas_common_font_font_all_unload(); } static void * -eng_context_new(void *data __UNUSED__) +eng_context_new(void *data EINA_UNUSED) { return evas_common_draw_context_new(); } static void -eng_context_free(void *data __UNUSED__, void *context) +eng_context_free(void *data EINA_UNUSED, void *context) { evas_common_draw_context_free(context); } static void -eng_context_clip_set(void *data __UNUSED__, void *context, int x, int y, int w, int h) +eng_context_clip_set(void *data EINA_UNUSED, void *context, int x, int y, int w, int h) { evas_common_draw_context_set_clip(context, x, y, w, h); } static void -eng_context_clip_clip(void *data __UNUSED__, void *context, int x, int y, int w, int h) +eng_context_clip_clip(void *data EINA_UNUSED, void *context, int x, int y, int w, int h) { evas_common_draw_context_clip_clip(context, x, y, w, h); } static void -eng_context_clip_unset(void *data __UNUSED__, void *context) +eng_context_clip_unset(void *data EINA_UNUSED, void *context) { evas_common_draw_context_unset_clip(context); } static int -eng_context_clip_get(void *data __UNUSED__, void *context, int *x, int *y, int *w, int *h) +eng_context_clip_get(void *data EINA_UNUSED, void *context, int *x, int *y, int *w, int *h) { *x = ((RGBA_Draw_Context *)context)->clip.x; *y = ((RGBA_Draw_Context *)context)->clip.y; @@ -331,13 +331,13 @@ eng_context_clip_get(void *data __UNUSED__, void *context, int *x, int *y, int * } static void -eng_context_color_set(void *data __UNUSED__, void *context, int r, int g, int b, int a) +eng_context_color_set(void *data EINA_UNUSED, void *context, int r, int g, int b, int a) { evas_common_draw_context_set_color(context, r, g, b, a); } static int -eng_context_color_get(void *data __UNUSED__, void *context, int *r, int *g, int *b, int *a) +eng_context_color_get(void *data EINA_UNUSED, void *context, int *r, int *g, int *b, int *a) { *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col)); *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col)); @@ -347,19 +347,19 @@ eng_context_color_get(void *data __UNUSED__, void *context, int *r, int *g, int } static void -eng_context_multiplier_set(void *data __UNUSED__, void *context, int r, int g, int b, int a) +eng_context_multiplier_set(void *data EINA_UNUSED, void *context, int r, int g, int b, int a) { evas_common_draw_context_set_multiplier(context, r, g, b, a); } static void -eng_context_multiplier_unset(void *data __UNUSED__, void *context) +eng_context_multiplier_unset(void *data EINA_UNUSED, void *context) { evas_common_draw_context_unset_multiplier(context); } static int -eng_context_multiplier_get(void *data __UNUSED__, void *context, int *r, int *g, int *b, int *a) +eng_context_multiplier_get(void *data EINA_UNUSED, void *context, int *r, int *g, int *b, int *a) { *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col)); *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col)); @@ -369,68 +369,68 @@ eng_context_multiplier_get(void *data __UNUSED__, void *context, int *r, int *g, } static void -eng_context_mask_set(void *data __UNUSED__, void *context, void *mask, int x, int y, int w, int h) +eng_context_mask_set(void *data EINA_UNUSED, void *context, void *mask, int x, int y, int w, int h) { evas_common_draw_context_set_mask(context, mask, x, y, w, h); } static void -eng_context_mask_unset(void *data __UNUSED__, void *context) +eng_context_mask_unset(void *data EINA_UNUSED, void *context) { evas_common_draw_context_unset_mask(context); } /* static void * -eng_context_mask_get(void *data __UNUSED__, void *context) +eng_context_mask_get(void *data EINA_UNUSED, void *context) { return ((RGBA_Draw_Context *)context)->mask.mask; } */ static void -eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h) +eng_context_cutout_add(void *data EINA_UNUSED, void *context, int x, int y, int w, int h) { evas_common_draw_context_add_cutout(context, x, y, w, h); } static void -eng_context_cutout_clear(void *data __UNUSED__, void *context) +eng_context_cutout_clear(void *data EINA_UNUSED, void *context) { evas_common_draw_context_clear_cutouts(context); } static void -eng_context_anti_alias_set(void *data __UNUSED__, void *context, unsigned char aa) +eng_context_anti_alias_set(void *data EINA_UNUSED, void *context, unsigned char aa) { evas_common_draw_context_set_anti_alias(context, aa); } static unsigned char -eng_context_anti_alias_get(void *data __UNUSED__, void *context) +eng_context_anti_alias_get(void *data EINA_UNUSED, void *context) { return ((RGBA_Draw_Context *)context)->anti_alias; } static void -eng_context_color_interpolation_set(void *data __UNUSED__, void *context, int color_space) +eng_context_color_interpolation_set(void *data EINA_UNUSED, void *context, int color_space) { evas_common_draw_context_set_color_interpolation(context, color_space); } static int -eng_context_color_interpolation_get(void *data __UNUSED__, void *context) +eng_context_color_interpolation_get(void *data EINA_UNUSED, void *context) { return ((RGBA_Draw_Context *)context)->interpolation.color_space; } static void -eng_context_render_op_set(void *data __UNUSED__, void *context, int op) +eng_context_render_op_set(void *data EINA_UNUSED, void *context, int op) { evas_common_draw_context_set_render_op(context, op); } static int -eng_context_render_op_get(void *data __UNUSED__, void *context) +eng_context_render_op_get(void *data EINA_UNUSED, void *context) { return ((RGBA_Draw_Context *)context)->render_op; } @@ -438,7 +438,7 @@ eng_context_render_op_get(void *data __UNUSED__, void *context) static void -eng_rectangle_draw(void *data __UNUSED__, void *context, void *surface, int x, int y, int w, int h) +eng_rectangle_draw(void *data EINA_UNUSED, void *context, void *surface, int x, int y, int w, int h) { #ifdef BUILD_PIPE_RENDER if ((cpunum > 1)) @@ -452,7 +452,7 @@ eng_rectangle_draw(void *data __UNUSED__, void *context, void *surface, int x, i } static void -eng_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2) +eng_line_draw(void *data EINA_UNUSED, void *context, void *surface, int x1, int y1, int x2, int y2) { #ifdef BUILD_PIPE_RENDER if ((cpunum > 1)) @@ -466,19 +466,19 @@ eng_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y } static void * -eng_polygon_point_add(void *data __UNUSED__, void *context __UNUSED__, void *polygon, int x, int y) +eng_polygon_point_add(void *data EINA_UNUSED, void *context EINA_UNUSED, void *polygon, int x, int y) { return evas_common_polygon_point_add(polygon, x, y); } static void * -eng_polygon_points_clear(void *data __UNUSED__, void *context __UNUSED__, void *polygon) +eng_polygon_points_clear(void *data EINA_UNUSED, void *context EINA_UNUSED, void *polygon) { return evas_common_polygon_points_clear(polygon); } static void -eng_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y) +eng_polygon_draw(void *data EINA_UNUSED, void *context, void *surface, void *polygon, int x, int y) { #ifdef BUILD_PIPE_RENDER if ((cpunum > 1)) @@ -492,7 +492,7 @@ eng_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *poly } static int -eng_image_alpha_get(void *data __UNUSED__, void *image) +eng_image_alpha_get(void *data EINA_UNUSED, void *image) { Image_Entry *im; @@ -509,7 +509,7 @@ eng_image_alpha_get(void *data __UNUSED__, void *image) } static int -eng_image_colorspace_get(void *data __UNUSED__, void *image) +eng_image_colorspace_get(void *data EINA_UNUSED, void *image) { Image_Entry *im; @@ -519,7 +519,7 @@ eng_image_colorspace_get(void *data __UNUSED__, void *image) } static Eina_Bool -eng_image_can_region_get(void *data __UNUSED__, void *image) +eng_image_can_region_get(void *data EINA_UNUSED, void *image) { Image_Entry *im; if (!image) return EINA_FALSE; @@ -532,7 +532,7 @@ eng_image_can_region_get(void *data __UNUSED__, void *image) } static void -eng_image_mask_create(void *data __UNUSED__, void *image) +eng_image_mask_create(void *data EINA_UNUSED, void *image) { RGBA_Image *im; int sz; @@ -558,7 +558,7 @@ eng_image_mask_create(void *data __UNUSED__, void *image) static void * -eng_image_alpha_set(void *data __UNUSED__, void *image, int has_alpha) +eng_image_alpha_set(void *data EINA_UNUSED, void *image, int has_alpha) { RGBA_Image *im; @@ -577,7 +577,7 @@ eng_image_alpha_set(void *data __UNUSED__, void *image, int has_alpha) } static void * -eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__) +eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED) { RGBA_Image *im; @@ -586,12 +586,12 @@ eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r } static void -eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) +eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED) { } static char * -eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) +eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key EINA_UNUSED) { RGBA_Image *im; @@ -601,13 +601,13 @@ eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) } static char * -eng_image_format_get(void *data __UNUSED__, void *image __UNUSED__) +eng_image_format_get(void *data EINA_UNUSED, void *image EINA_UNUSED) { return NULL; } static void -eng_image_colorspace_set(void *data __UNUSED__, void *image, int cspace) +eng_image_colorspace_set(void *data EINA_UNUSED, void *image, int cspace) { Image_Entry *im; @@ -617,7 +617,7 @@ eng_image_colorspace_set(void *data __UNUSED__, void *image, int cspace) } static void * -eng_image_native_set(void *data __UNUSED__, void *image, void *native __UNUSED__) +eng_image_native_set(void *data EINA_UNUSED, void *image, void *native EINA_UNUSED) { //return image; Evas_Native_Surface *ns = native; @@ -653,13 +653,13 @@ eng_image_native_set(void *data __UNUSED__, void *image, void *native __UNUSED__ } static void * -eng_image_native_get(void *data __UNUSED__, void *image __UNUSED__) +eng_image_native_get(void *data EINA_UNUSED, void *image EINA_UNUSED) { return NULL; } static void * -eng_image_load(void *data __UNUSED__, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo) +eng_image_load(void *data EINA_UNUSED, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo) { *error = EVAS_LOAD_ERROR_NONE; #ifdef EVAS_CSERVE2 @@ -678,7 +678,7 @@ eng_image_load(void *data __UNUSED__, const char *file, const char *key, int *er } static void * -eng_image_new_from_data(void *data __UNUSED__, int w, int h, DATA32 *image_data, int alpha, int cspace) +eng_image_new_from_data(void *data EINA_UNUSED, int w, int h, DATA32 *image_data, int alpha, int cspace) { #ifdef EVAS_CSERVE2 if (evas_cserve2_use_get()) @@ -691,7 +691,7 @@ eng_image_new_from_data(void *data __UNUSED__, int w, int h, DATA32 *image_data, } static void * -eng_image_new_from_copied_data(void *data __UNUSED__, int w, int h, DATA32 *image_data, int alpha, int cspace) +eng_image_new_from_copied_data(void *data EINA_UNUSED, int w, int h, DATA32 *image_data, int alpha, int cspace) { #ifdef EVAS_CSERVE2 if (evas_cserve2_use_get()) @@ -705,7 +705,7 @@ eng_image_new_from_copied_data(void *data __UNUSED__, int w, int h, DATA32 *imag } static void -eng_image_free(void *data __UNUSED__, void *image) +eng_image_free(void *data EINA_UNUSED, void *image) { #ifdef EVAS_CSERVE2 if (evas_cserve2_use_get()) @@ -718,7 +718,7 @@ eng_image_free(void *data __UNUSED__, void *image) } static void -eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h) +eng_image_size_get(void *data EINA_UNUSED, void *image, int *w, int *h) { Image_Entry *im; @@ -728,7 +728,7 @@ eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h) } static void * -eng_image_size_set(void *data __UNUSED__, void *image, int w, int h) +eng_image_size_set(void *data EINA_UNUSED, void *image, int w, int h) { Image_Entry *im = image; if (!im) return NULL; @@ -740,7 +740,7 @@ eng_image_size_set(void *data __UNUSED__, void *image, int w, int h) } static void * -eng_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h) +eng_image_dirty_region(void *data EINA_UNUSED, void *image, int x, int y, int w, int h) { Image_Entry *im = image; if (!im) return NULL; @@ -752,7 +752,7 @@ eng_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, } static void * -eng_image_data_get(void *data __UNUSED__, void *image, int to_write, DATA32 **image_data, int *err) +eng_image_data_get(void *data EINA_UNUSED, void *image, int to_write, DATA32 **image_data, int *err) { RGBA_Image *im; int error = EVAS_LOAD_ERROR_NONE; @@ -855,7 +855,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data) } static void -eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target) { RGBA_Image *im = image; if (!im) return ; @@ -871,7 +871,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t } static void -eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target) { RGBA_Image *im = image; #ifdef EVAS_CSERVE2 @@ -884,7 +884,7 @@ eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *ta } static void -eng_image_draw(void *data __UNUSED__, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth) +eng_image_draw(void *data EINA_UNUSED, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth) { RGBA_Image *im; @@ -1010,13 +1010,13 @@ eng_image_map_draw(void *data, void *context, void *surface, void *image, RGBA_M } static void -eng_image_map_clean(void *data __UNUSED__, RGBA_Map *m) +eng_image_map_clean(void *data EINA_UNUSED, RGBA_Map *m) { evas_common_map_rgba_clean(m); } static void * -eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) +eng_image_map_surface_new(void *data EINA_UNUSED, int w, int h, int alpha) { void *surface; #ifdef EVAS_CSERVE2 @@ -1037,7 +1037,7 @@ eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) } static void -eng_image_map_surface_free(void *data __UNUSED__, void *surface) +eng_image_map_surface_free(void *data EINA_UNUSED, void *surface) { #ifdef EVAS_CSERVE2 if (evas_cserve2_use_get()) @@ -1050,7 +1050,7 @@ eng_image_map_surface_free(void *data __UNUSED__, void *surface) } static void -eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint) { Image_Entry *im; @@ -1060,7 +1060,7 @@ eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) } static int -eng_image_scale_hint_get(void *data __UNUSED__, void *image) +eng_image_scale_hint_get(void *data EINA_UNUSED, void *image) { Image_Entry *im; @@ -1070,7 +1070,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image) } static Eina_Bool -eng_image_animated_get(void *data __UNUSED__, void *image) +eng_image_animated_get(void *data EINA_UNUSED, void *image) { Image_Entry *im; @@ -1080,7 +1080,7 @@ eng_image_animated_get(void *data __UNUSED__, void *image) } static int -eng_image_animated_frame_count_get(void *data __UNUSED__, void *image) +eng_image_animated_frame_count_get(void *data EINA_UNUSED, void *image) { Image_Entry *im; @@ -1091,7 +1091,7 @@ eng_image_animated_frame_count_get(void *data __UNUSED__, void *image) } static Evas_Image_Animated_Loop_Hint -eng_image_animated_loop_type_get(void *data __UNUSED__, void *image) +eng_image_animated_loop_type_get(void *data EINA_UNUSED, void *image) { Image_Entry *im; @@ -1102,7 +1102,7 @@ eng_image_animated_loop_type_get(void *data __UNUSED__, void *image) } static int -eng_image_animated_loop_count_get(void *data __UNUSED__, void *image) +eng_image_animated_loop_count_get(void *data EINA_UNUSED, void *image) { Image_Entry *im; @@ -1113,7 +1113,7 @@ eng_image_animated_loop_count_get(void *data __UNUSED__, void *image) } static double -eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int start_frame, int frame_num) +eng_image_animated_frame_duration_get(void *data EINA_UNUSED, void *image, int start_frame, int frame_num) { Image_Entry *im; @@ -1124,7 +1124,7 @@ eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int st } static Eina_Bool -eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index) +eng_image_animated_frame_set(void *data EINA_UNUSED, void *image, int frame_index) { Image_Entry *im; @@ -1137,7 +1137,7 @@ eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index } static void -eng_image_cache_flush(void *data __UNUSED__) +eng_image_cache_flush(void *data EINA_UNUSED) { int tmp_size; @@ -1148,96 +1148,96 @@ eng_image_cache_flush(void *data __UNUSED__) } static void -eng_image_cache_set(void *data __UNUSED__, int bytes) +eng_image_cache_set(void *data EINA_UNUSED, int bytes) { evas_common_image_set_cache(bytes); evas_common_rgba_image_scalecache_size_set(bytes); } static int -eng_image_cache_get(void *data __UNUSED__) +eng_image_cache_get(void *data EINA_UNUSED) { return evas_common_image_get_cache(); } static Evas_Font_Set * -eng_font_load(void *data __UNUSED__, const char *name, int size, +eng_font_load(void *data EINA_UNUSED, const char *name, int size, Font_Rend_Flags wanted_rend) { return (Evas_Font_Set *) evas_common_font_load(name, size, wanted_rend); } static Evas_Font_Set * -eng_font_memory_load(void *data __UNUSED__, const char *source, const char *name, int size, const void *fdata, int fdata_size, Font_Rend_Flags wanted_rend) +eng_font_memory_load(void *data EINA_UNUSED, const char *source, const char *name, int size, const void *fdata, int fdata_size, Font_Rend_Flags wanted_rend) { return (Evas_Font_Set *) evas_common_font_memory_load(source, name, size, fdata, fdata_size, wanted_rend); } static Evas_Font_Set * -eng_font_add(void *data __UNUSED__, Evas_Font_Set *font, const char *name, int size, Font_Rend_Flags wanted_rend) +eng_font_add(void *data EINA_UNUSED, Evas_Font_Set *font, const char *name, int size, Font_Rend_Flags wanted_rend) { return (Evas_Font_Set *) evas_common_font_add((RGBA_Font *) font, name, size, wanted_rend); } static Evas_Font_Set * -eng_font_memory_add(void *data __UNUSED__, Evas_Font_Set *font, const char *source, const char *name, int size, const void *fdata, int fdata_size, Font_Rend_Flags wanted_rend) +eng_font_memory_add(void *data EINA_UNUSED, Evas_Font_Set *font, const char *source, const char *name, int size, const void *fdata, int fdata_size, Font_Rend_Flags wanted_rend) { return (Evas_Font_Set *) evas_common_font_memory_add((RGBA_Font *) font, source, name, size, fdata, fdata_size, wanted_rend); } static void -eng_font_free(void *data __UNUSED__, Evas_Font_Set *font) +eng_font_free(void *data EINA_UNUSED, Evas_Font_Set *font) { evas_common_font_free((RGBA_Font *) font); } static int -eng_font_ascent_get(void *data __UNUSED__, Evas_Font_Set *font) +eng_font_ascent_get(void *data EINA_UNUSED, Evas_Font_Set *font) { return evas_common_font_ascent_get((RGBA_Font *) font); } static int -eng_font_descent_get(void *data __UNUSED__, Evas_Font_Set *font) +eng_font_descent_get(void *data EINA_UNUSED, Evas_Font_Set *font) { return evas_common_font_descent_get((RGBA_Font *) font); } static int -eng_font_max_ascent_get(void *data __UNUSED__, Evas_Font_Set *font) +eng_font_max_ascent_get(void *data EINA_UNUSED, Evas_Font_Set *font) { return evas_common_font_max_ascent_get((RGBA_Font *) font); } static int -eng_font_max_descent_get(void *data __UNUSED__, Evas_Font_Set *font) +eng_font_max_descent_get(void *data EINA_UNUSED, Evas_Font_Set *font) { return evas_common_font_max_descent_get((RGBA_Font *) font); } static void -eng_font_string_size_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int *w, int *h) +eng_font_string_size_get(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props, int *w, int *h) { evas_common_font_query_size((RGBA_Font *) font, text_props, w, h); } static int -eng_font_inset_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props) +eng_font_inset_get(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props) { return evas_common_font_query_inset((RGBA_Font *) font, text_props); } static int -eng_font_right_inset_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props) +eng_font_right_inset_get(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props) { return evas_common_font_query_right_inset((RGBA_Font *) font, text_props); } static int -eng_font_h_advance_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props) +eng_font_h_advance_get(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props) { int h, v; @@ -1246,7 +1246,7 @@ eng_font_h_advance_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Te } static int -eng_font_v_advance_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props) +eng_font_v_advance_get(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props) { int h, v; @@ -1255,38 +1255,38 @@ eng_font_v_advance_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Te } static int -eng_font_pen_coords_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch) +eng_font_pen_coords_get(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch) { return evas_common_font_query_pen_coords((RGBA_Font *) font, text_props, pos, cpen_x, cy, cadv, ch); } static Eina_Bool -eng_font_text_props_info_create(void *data __UNUSED__, Evas_Font_Instance *fi, const Eina_Unicode *text, Evas_Text_Props *text_props, const Evas_BiDi_Paragraph_Props *par_props, size_t par_pos, size_t len, Evas_Text_Props_Mode mode) +eng_font_text_props_info_create(void *data EINA_UNUSED, Evas_Font_Instance *fi, const Eina_Unicode *text, Evas_Text_Props *text_props, const Evas_BiDi_Paragraph_Props *par_props, size_t par_pos, size_t len, Evas_Text_Props_Mode mode) { return evas_common_text_props_content_create((RGBA_Font_Int *) fi, text, text_props, par_props, par_pos, len, mode); } static int -eng_font_char_coords_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch) +eng_font_char_coords_get(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch) { return evas_common_font_query_char_coords((RGBA_Font *) font, text_props, pos, cx, cy, cw, ch); } static int -eng_font_char_at_coords_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch) +eng_font_char_at_coords_get(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch) { return evas_common_font_query_char_at_coords((RGBA_Font *) font, text_props, x, y, cx, cy, cw, ch); } static int -eng_font_last_up_to_pos(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int x, int y) +eng_font_last_up_to_pos(void *data EINA_UNUSED, Evas_Font_Set *font, const Evas_Text_Props *text_props, int x, int y) { return evas_common_font_query_last_up_to_pos((RGBA_Font *) font, text_props, x, y); } static int -eng_font_run_font_end_get(void *data __UNUSED__, Evas_Font_Set *font, Evas_Font_Instance **script_fi, Evas_Font_Instance **cur_fi, Evas_Script_Type script, const Eina_Unicode *text, int run_len) +eng_font_run_font_end_get(void *data EINA_UNUSED, Evas_Font_Set *font, Evas_Font_Instance **script_fi, Evas_Font_Instance **cur_fi, Evas_Script_Type script, const Eina_Unicode *text, int run_len) { return evas_common_font_query_run_font_end_get((RGBA_Font *) font, (RGBA_Font_Int **) script_fi, (RGBA_Font_Int **) cur_fi, @@ -1294,7 +1294,7 @@ eng_font_run_font_end_get(void *data __UNUSED__, Evas_Font_Set *font, Evas_Font_ } static void -eng_font_draw(void *data __UNUSED__, void *context, void *surface, Evas_Font_Set *font __UNUSED__, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *text_props) +eng_font_draw(void *data EINA_UNUSED, void *context, void *surface, Evas_Font_Set *font EINA_UNUSED, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *text_props) { #ifdef BUILD_PIPE_RENDER if ((cpunum > 1)) @@ -1309,7 +1309,7 @@ eng_font_draw(void *data __UNUSED__, void *context, void *surface, Evas_Font_Set } static void -eng_font_cache_flush(void *data __UNUSED__) +eng_font_cache_flush(void *data EINA_UNUSED) { int tmp_size; @@ -1320,31 +1320,31 @@ eng_font_cache_flush(void *data __UNUSED__) } static void -eng_font_cache_set(void *data __UNUSED__, int bytes) +eng_font_cache_set(void *data EINA_UNUSED, int bytes) { evas_common_font_cache_set(bytes); } static int -eng_font_cache_get(void *data __UNUSED__) +eng_font_cache_get(void *data EINA_UNUSED) { return evas_common_font_cache_get(); } static void -eng_font_hinting_set(void *data __UNUSED__, Evas_Font_Set *font, int hinting) +eng_font_hinting_set(void *data EINA_UNUSED, Evas_Font_Set *font, int hinting) { evas_common_font_hinting_set((RGBA_Font *) font, hinting); } static int -eng_font_hinting_can_hint(void *data __UNUSED__, int hinting) +eng_font_hinting_can_hint(void *data EINA_UNUSED, int hinting) { return evas_common_hinting_available(hinting); } static Eina_Bool -eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__) +eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED) { return EINA_TRUE; } @@ -1353,7 +1353,7 @@ eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__) /* Filter API */ #if 0 // filtering disabled static void -eng_image_draw_filtered(void *data __UNUSED__, void *context __UNUSED__, +eng_image_draw_filtered(void *data EINA_UNUSED, void *context EINA_UNUSED, void *surface, void *image, Evas_Filter_Info *filter) { Evas_Software_Filter_Fn fn; @@ -1433,7 +1433,7 @@ eng_image_filtered_free(void *image, Filtered_Image *fi) #endif static int -eng_image_load_error_get(void *data __UNUSED__, void *image) +eng_image_load_error_get(void *data EINA_UNUSED, void *image) { RGBA_Image *im; @@ -1444,7 +1444,7 @@ eng_image_load_error_get(void *data __UNUSED__, void *image) //------------ Evas GL engine code ---------------// static void * -eng_gl_surface_create(void *data __UNUSED__, void *config, int w, int h) +eng_gl_surface_create(void *data EINA_UNUSED, void *config, int w, int h) { #ifdef EVAS_GL Render_Engine_GL_Surface *sfc; @@ -1540,7 +1540,7 @@ eng_gl_surface_create(void *data __UNUSED__, void *config, int w, int h) } static int -eng_gl_surface_destroy(void *data __UNUSED__, void *surface) +eng_gl_surface_destroy(void *data EINA_UNUSED, void *surface) { #ifdef EVAS_GL Render_Engine_GL_Surface *sfc; @@ -1563,7 +1563,7 @@ eng_gl_surface_destroy(void *data __UNUSED__, void *surface) } static void * -eng_gl_context_create(void *data __UNUSED__, void *share_context) +eng_gl_context_create(void *data EINA_UNUSED, void *share_context) { #ifdef EVAS_GL Render_Engine_GL_Context *ctx; @@ -1602,7 +1602,7 @@ eng_gl_context_create(void *data __UNUSED__, void *share_context) } static int -eng_gl_context_destroy(void *data __UNUSED__, void *context) +eng_gl_context_destroy(void *data EINA_UNUSED, void *context) { #ifdef EVAS_GL Render_Engine_GL_Context *ctx; @@ -1624,7 +1624,7 @@ eng_gl_context_destroy(void *data __UNUSED__, void *context) } static int -eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) +eng_gl_make_current(void *data EINA_UNUSED, void *surface, void *context) { #ifdef EVAS_GL Render_Engine_GL_Surface *sfc; @@ -1692,13 +1692,13 @@ eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) // FIXME!!! Implement later static void * -eng_gl_string_query(void *data __UNUSED__, int name __UNUSED__) +eng_gl_string_query(void *data EINA_UNUSED, int name EINA_UNUSED) { return NULL; } static void * -eng_gl_proc_address_get(void *data __UNUSED__, const char *name) +eng_gl_proc_address_get(void *data EINA_UNUSED, const char *name) { #ifdef EVAS_GL if (_sym_OSMesaGetProcAddress) return _sym_OSMesaGetProcAddress(name); @@ -1710,7 +1710,7 @@ eng_gl_proc_address_get(void *data __UNUSED__, const char *name) } static int -eng_gl_native_surface_get(void *data __UNUSED__, void *surface, void *native_surface) +eng_gl_native_surface_get(void *data EINA_UNUSED, void *surface, void *native_surface) { #ifdef EVAS_GL Render_Engine_GL_Surface *sfc; @@ -1735,7 +1735,7 @@ eng_gl_native_surface_get(void *data __UNUSED__, void *surface, void *native_sur static void * -eng_gl_api_get(void *data __UNUSED__) +eng_gl_api_get(void *data EINA_UNUSED) { #ifdef EVAS_GL return &gl_funcs; @@ -2620,7 +2620,7 @@ evgl_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLi static void -evgl_glGetShaderPrecisionFormat(GLenum shadertype __UNUSED__, GLenum precisiontype __UNUSED__, GLint* range, GLint* precision) +evgl_glGetShaderPrecisionFormat(GLenum shadertype EINA_UNUSED, GLenum precisiontype EINA_UNUSED, GLint* range, GLint* precision) { if (range) { @@ -2642,7 +2642,7 @@ evgl_glReleaseShaderCompiler(void) } static void -evgl_glShaderBinary(GLsizei n __UNUSED__, const GLuint* shaders __UNUSED__, GLenum binaryformat __UNUSED__, const void* binary __UNUSED__, GLsizei length __UNUSED__) +evgl_glShaderBinary(GLsizei n EINA_UNUSED, const GLuint* shaders EINA_UNUSED, GLenum binaryformat EINA_UNUSED, const void* binary EINA_UNUSED, GLsizei length EINA_UNUSED) { // FIXME: need to dlsym/getprocaddress for this DBG("Not supported in Desktop GL"); @@ -2902,7 +2902,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_soft_gen_log_dom); } diff --git a/legacy/evas/src/modules/engines/software_x11/Evas_Engine_Software_X11.h b/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/Evas_Engine_Software_X11.h rename to src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c similarity index 99% rename from legacy/evas/src/modules/engines/software_x11/evas_engine.c rename to src/modules/evas/engines/software_x11/evas_engine.c index cf3dcdd36d..0b17572713 100644 --- a/legacy/evas/src/modules/engines/software_x11/evas_engine.c +++ b/src/modules/evas/engines/software_x11/evas_engine.c @@ -355,7 +355,7 @@ _best_depth_get(int backend, void *connection, int screen) /* engine api this module provides */ static void * -eng_info(Evas *eo_e __UNUSED__) +eng_info(Evas *eo_e EINA_UNUSED) { Evas_Engine_Info_Software_X11 *info; @@ -374,7 +374,7 @@ eng_info(Evas *eo_e __UNUSED__) } static void -eng_info_free(Evas *eo_e __UNUSED__, void *info) +eng_info_free(Evas *eo_e EINA_UNUSED, void *info) { Evas_Engine_Info_Software_X11 *in; @@ -692,7 +692,7 @@ eng_output_idle_flush(void *data) } static Eina_Bool -eng_canvas_alpha_get(void *data, void *context __UNUSED__) +eng_canvas_alpha_get(void *data, void *context EINA_UNUSED) { Render_Engine *re; @@ -755,7 +755,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_engine_soft_x11_log_dom); } diff --git a/legacy/evas/src/modules/engines/software_x11/evas_engine.h b/src/modules/evas/engines/software_x11/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_engine.h rename to src/modules/evas/engines/software_x11/evas_engine.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_x_egl.c b/src/modules/evas/engines/software_x11/evas_x_egl.c similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_x_egl.c rename to src/modules/evas/engines/software_x11/evas_x_egl.c diff --git a/legacy/evas/src/modules/engines/software_x11/evas_x_egl.h b/src/modules/evas/engines/software_x11/evas_x_egl.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_x_egl.h rename to src/modules/evas/engines/software_x11/evas_x_egl.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_buffer.c b/src/modules/evas/engines/software_x11/evas_xcb_buffer.c similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_buffer.c rename to src/modules/evas/engines/software_x11/evas_xcb_buffer.c diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_buffer.h b/src/modules/evas/engines/software_x11/evas_xcb_buffer.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_buffer.h rename to src/modules/evas/engines/software_x11/evas_xcb_buffer.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_color.c b/src/modules/evas/engines/software_x11/evas_xcb_color.c similarity index 99% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_color.c rename to src/modules/evas/engines/software_x11/evas_xcb_color.c index f451fa193f..2362ac26bc 100644 --- a/legacy/evas/src/modules/engines/software_x11/evas_xcb_color.c +++ b/src/modules/evas/engines/software_x11/evas_xcb_color.c @@ -403,7 +403,7 @@ evas_software_xcb_color_allocate(xcb_connection_t *conn, void evas_software_xcb_color_deallocate(xcb_connection_t *conn, xcb_colormap_t cmap, - xcb_visualtype_t *vis __UNUSED__, + xcb_visualtype_t *vis EINA_UNUSED, Convert_Pal *pal) { uint32_t pixels[256]; diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_color.h b/src/modules/evas/engines/software_x11/evas_xcb_color.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_color.h rename to src/modules/evas/engines/software_x11/evas_xcb_color.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_main.c b/src/modules/evas/engines/software_x11/evas_xcb_main.c similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_main.c rename to src/modules/evas/engines/software_x11/evas_xcb_main.c diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_outbuf.c b/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c similarity index 99% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_outbuf.c rename to src/modules/evas/engines/software_x11/evas_xcb_outbuf.c index 9e6b8d156b..9b0079f34f 100644 --- a/legacy/evas/src/modules/engines/software_x11/evas_xcb_outbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c @@ -545,7 +545,7 @@ evas_software_xcb_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w, } void -evas_software_xcb_outbuf_free_region_for_update(Outbuf *buf __UNUSED__, RGBA_Image *update __UNUSED__) +evas_software_xcb_outbuf_free_region_for_update(Outbuf *buf EINA_UNUSED, RGBA_Image *update EINA_UNUSED) { /* NOOP: Cleaned up on flush */ } diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_outbuf.h b/src/modules/evas/engines/software_x11/evas_xcb_outbuf.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_outbuf.h rename to src/modules/evas/engines/software_x11/evas_xcb_outbuf.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.c b/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.c rename to src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.h b/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.h rename to src/modules/evas/engines/software_x11/evas_xcb_xdefaults.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xlib_buffer.c b/src/modules/evas/engines/software_x11/evas_xlib_buffer.c similarity index 99% rename from legacy/evas/src/modules/engines/software_x11/evas_xlib_buffer.c rename to src/modules/evas/engines/software_x11/evas_xlib_buffer.c index 756ffb7f84..cc655f2dcb 100644 --- a/legacy/evas/src/modules/engines/software_x11/evas_xlib_buffer.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_buffer.c @@ -253,7 +253,7 @@ evas_software_xlib_x_can_do_shm(Display *d) } static void -x_output_tmp_x_err(Display *d __UNUSED__, XErrorEvent *ev __UNUSED__) +x_output_tmp_x_err(Display *d EINA_UNUSED, XErrorEvent *ev EINA_UNUSED) { _x_err = 1; return; diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xlib_buffer.h b/src/modules/evas/engines/software_x11/evas_xlib_buffer.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xlib_buffer.h rename to src/modules/evas/engines/software_x11/evas_xlib_buffer.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xlib_color.c b/src/modules/evas/engines/software_x11/evas_xlib_color.c similarity index 99% rename from legacy/evas/src/modules/engines/software_x11/evas_xlib_color.c rename to src/modules/evas/engines/software_x11/evas_xlib_color.c index a59a08ea85..806823d8e7 100644 --- a/legacy/evas/src/modules/engines/software_x11/evas_xlib_color.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_color.c @@ -347,7 +347,7 @@ evas_software_xlib_x_color_allocate(Display *disp, void evas_software_xlib_x_color_deallocate(Display *disp, Colormap cmap, - Visual *vis __UNUSED__, + Visual *vis EINA_UNUSED, Convert_Pal *pal) { unsigned long pixels[256]; diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xlib_color.h b/src/modules/evas/engines/software_x11/evas_xlib_color.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xlib_color.h rename to src/modules/evas/engines/software_x11/evas_xlib_color.h diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xlib_main.c b/src/modules/evas/engines/software_x11/evas_xlib_main.c similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xlib_main.c rename to src/modules/evas/engines/software_x11/evas_xlib_main.c diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c similarity index 99% rename from legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c rename to src/modules/evas/engines/software_x11/evas_xlib_outbuf.c index c2e1a9abfc..47763c43a1 100644 --- a/legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c @@ -699,7 +699,7 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w } void -evas_software_xlib_outbuf_free_region_for_update(Outbuf *buf __UNUSED__, RGBA_Image *update __UNUSED__) +evas_software_xlib_outbuf_free_region_for_update(Outbuf *buf EINA_UNUSED, RGBA_Image *update EINA_UNUSED) { /* no need to do anything - they are cleaned up on flush */ } diff --git a/legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.h b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.h similarity index 100% rename from legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.h rename to src/modules/evas/engines/software_x11/evas_xlib_outbuf.h diff --git a/legacy/evas/src/modules/engines/wayland_egl/Evas_Engine_Wayland_Egl.h b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h similarity index 100% rename from legacy/evas/src/modules/engines/wayland_egl/Evas_Engine_Wayland_Egl.h rename to src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h diff --git a/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c similarity index 97% rename from legacy/evas/src/modules/engines/wayland_egl/evas_engine.c rename to src/modules/evas/engines/wayland_egl/evas_engine.c index f0f82d1c67..4a89c20f4f 100644 --- a/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -516,7 +516,7 @@ static Evas_Func func, pfunc; static Evas_GL_API gl_funcs; static void * -eng_info(Evas *e __UNUSED__) +eng_info(Evas *e EINA_UNUSED) { Evas_Engine_Info_Wayland_Egl *info; @@ -529,7 +529,7 @@ eng_info(Evas *e __UNUSED__) } static void -eng_info_free(Evas *e __UNUSED__, void *info) +eng_info_free(Evas *e EINA_UNUSED, void *info) { Evas_Engine_Info_Wayland_Egl *in; // dont free! why bother? its not worth it @@ -1012,7 +1012,7 @@ get_time(void) static int safe_native = -1; static void -eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +eng_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) { Render_Engine *re; #ifdef FRAMECOUNT @@ -1106,7 +1106,7 @@ eng_output_flush(void *data) } static void -eng_output_idle_flush(void *data __UNUSED__) +eng_output_idle_flush(void *data EINA_UNUSED) { /* Render_Engine *re; */ @@ -1126,7 +1126,7 @@ eng_output_dump(void *data) } static void -eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h) +eng_context_cutout_add(void *data EINA_UNUSED, void *context, int x, int y, int w, int h) { // Render_Engine *re; // @@ -1136,7 +1136,7 @@ eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w } static void -eng_context_cutout_clear(void *data __UNUSED__, void *context) +eng_context_cutout_clear(void *data EINA_UNUSED, void *context) { // Render_Engine *re; // @@ -1170,7 +1170,7 @@ eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, } static void * -eng_polygon_point_add(void *data __UNUSED__, void *context __UNUSED__, void *polygon, int x, int y) +eng_polygon_point_add(void *data EINA_UNUSED, void *context EINA_UNUSED, void *polygon, int x, int y) { /* Render_Engine *re; */ @@ -1179,7 +1179,7 @@ eng_polygon_point_add(void *data __UNUSED__, void *context __UNUSED__, void *pol } static void * -eng_polygon_points_clear(void *data __UNUSED__, void *context __UNUSED__, void *polygon) +eng_polygon_points_clear(void *data EINA_UNUSED, void *context EINA_UNUSED, void *polygon) { /* Render_Engine *re; */ @@ -1188,7 +1188,7 @@ eng_polygon_points_clear(void *data __UNUSED__, void *context __UNUSED__, void * } static void -eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *polygon, int x, int y) +eng_polygon_draw(void *data, void *context, void *surface EINA_UNUSED, void *polygon, int x, int y) { Render_Engine *re; @@ -1200,7 +1200,7 @@ eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *poly } static int -eng_image_alpha_get(void *data __UNUSED__, void *image) +eng_image_alpha_get(void *data EINA_UNUSED, void *image) { // Render_Engine *re; Evas_GL_Image *im; @@ -1212,7 +1212,7 @@ eng_image_alpha_get(void *data __UNUSED__, void *image) } static int -eng_image_colorspace_get(void *data __UNUSED__, void *image) +eng_image_colorspace_get(void *data EINA_UNUSED, void *image) { // Render_Engine *re; Evas_GL_Image *im; @@ -1224,7 +1224,7 @@ eng_image_colorspace_get(void *data __UNUSED__, void *image) } static void -eng_image_mask_create(void *data __UNUSED__, void *image) +eng_image_mask_create(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im; @@ -1286,7 +1286,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha) } static void * -eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__) +eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED) { // Render_Engine *re; // @@ -1295,7 +1295,7 @@ eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r } static void -eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) +eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED) { // Render_Engine *re; // @@ -1303,7 +1303,7 @@ eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNU } static char * -eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) +eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key EINA_UNUSED) { // Render_Engine *re; Evas_GL_Image *im; @@ -1316,7 +1316,7 @@ eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__) } static char * -eng_image_format_get(void *data __UNUSED__, void *image __UNUSED__) +eng_image_format_get(void *data EINA_UNUSED, void *image EINA_UNUSED) { // Render_Engine *re; /* Evas_GL_Image *im; */ @@ -1398,7 +1398,7 @@ struct _Native //#define GLX_TEX_PIXMAP_RECREATE 1 static void -_native_bind_cb(void *data __UNUSED__, void *image) +_native_bind_cb(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im = image; Native *n = im->native.data; @@ -1411,7 +1411,7 @@ _native_bind_cb(void *data __UNUSED__, void *image) } static void -_native_unbind_cb(void *data __UNUSED__, void *image) +_native_unbind_cb(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im = image; Native *n = im->native.data; @@ -1547,7 +1547,7 @@ eng_image_native_set(void *data, void *image, void *native) } static void * -eng_image_native_get(void *data __UNUSED__, void *image) +eng_image_native_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im; Native *n; @@ -1633,7 +1633,7 @@ eng_image_free(void *data, void *image) } static void -eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h) +eng_image_size_get(void *data EINA_UNUSED, void *image, int *w, int *h) { if (!image) { @@ -1898,7 +1898,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data) } static void -eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target) { Evas_GL_Image *gim = image; RGBA_Image *im; @@ -1911,7 +1911,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t } static void -eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target) +eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target) { Evas_GL_Image *gim = image; RGBA_Image *im; @@ -1946,13 +1946,13 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, } static void -eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint) { if (image) evas_gl_common_image_scale_hint_set(image, hint); } static int -eng_image_scale_hint_get(void *data __UNUSED__, void *image) +eng_image_scale_hint_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE; @@ -2020,19 +2020,19 @@ eng_image_map_surface_new(void *data, int w, int h, int alpha) } static void -eng_image_map_surface_free(void *data __UNUSED__, void *surface) +eng_image_map_surface_free(void *data EINA_UNUSED, void *surface) { evas_gl_common_image_free(surface); } static void -eng_image_content_hint_set(void *data __UNUSED__, void *image, int hint) +eng_image_content_hint_set(void *data EINA_UNUSED, void *image, int hint) { if (image) evas_gl_common_image_content_hint_set(image, hint); } static int -eng_image_content_hint_get(void *data __UNUSED__, void *image) +eng_image_content_hint_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; if (!gim) return EVAS_IMAGE_CONTENT_HINT_NONE; @@ -2068,13 +2068,13 @@ eng_image_cache_set(void *data, int bytes) } static int -eng_image_cache_get(void *data __UNUSED__) +eng_image_cache_get(void *data EINA_UNUSED) { return evas_common_image_get_cache(); } static void -eng_image_stride_get(void *data __UNUSED__, void *image, int *stride) +eng_image_stride_get(void *data EINA_UNUSED, void *image, int *stride) { Evas_GL_Image *im = image; @@ -2085,7 +2085,7 @@ eng_image_stride_get(void *data __UNUSED__, void *image, int *stride) } static void -eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UNUSED__, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props) +eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font EINA_UNUSED, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props) { Render_Engine *re; @@ -2113,7 +2113,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UN } static Eina_Bool -eng_canvas_alpha_get(void *data, void *info __UNUSED__) +eng_canvas_alpha_get(void *data, void *info EINA_UNUSED) { Render_Engine *re = (Render_Engine *)data; @@ -2178,7 +2178,7 @@ _set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg) } static int -_attach_fbo_surface(Render_Engine *data __UNUSED__, +_attach_fbo_surface(Render_Engine *data EINA_UNUSED, Render_Engine_GL_Surface *sfc, int fbo) { int fb_status, curr_tex, curr_rb; @@ -2317,7 +2317,7 @@ _attach_fbo_surface(Render_Engine *data __UNUSED__, } static int -_create_rt_buffers(Render_Engine *data __UNUSED__, +_create_rt_buffers(Render_Engine *data EINA_UNUSED, Render_Engine_GL_Surface *sfc) { int ret = 0; @@ -2812,7 +2812,7 @@ eng_gl_context_destroy(void *data, void *context) } static int -eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) +eng_gl_make_current(void *data EINA_UNUSED, void *surface, void *context) { Render_Engine *re; Render_Engine_GL_Surface *sfc; @@ -2953,7 +2953,7 @@ eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) } static void * -eng_gl_string_query(void *data __UNUSED__, int name) +eng_gl_string_query(void *data EINA_UNUSED, int name) { switch(name) { @@ -2965,14 +2965,14 @@ eng_gl_string_query(void *data __UNUSED__, int name) } static void * -eng_gl_proc_address_get(void *data __UNUSED__, const char *name) +eng_gl_proc_address_get(void *data EINA_UNUSED, const char *name) { if (glsym_eglGetProcAddress) return glsym_eglGetProcAddress(name); return dlsym(RTLD_DEFAULT, name); } static int -eng_gl_native_surface_get(void *data __UNUSED__, void *surface, void *native_surface) +eng_gl_native_surface_get(void *data EINA_UNUSED, void *surface, void *native_surface) { /* Render_Engine *re; */ Render_Engine_GL_Surface *sfc; @@ -3328,7 +3328,7 @@ evgl_glEvasGLImageTargetRenderbufferStorageOES(GLenum target, EvasGLImage image) static void * -eng_gl_api_get(void *data __UNUSED__) +eng_gl_api_get(void *data EINA_UNUSED) { /* Render_Engine *re; */ @@ -3565,7 +3565,7 @@ eng_gl_api_get(void *data __UNUSED__) } static int -eng_image_load_error_get(void *data __UNUSED__, void *image) +eng_image_load_error_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *im; @@ -3575,7 +3575,7 @@ eng_image_load_error_get(void *data __UNUSED__, void *image) } static Eina_Bool -eng_image_animated_get(void *data __UNUSED__, void *image) +eng_image_animated_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -3588,7 +3588,7 @@ eng_image_animated_get(void *data __UNUSED__, void *image) } static int -eng_image_animated_frame_count_get(void *data __UNUSED__, void *image) +eng_image_animated_frame_count_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -3602,7 +3602,7 @@ eng_image_animated_frame_count_get(void *data __UNUSED__, void *image) } static Evas_Image_Animated_Loop_Hint -eng_image_animated_loop_type_get(void *data __UNUSED__, void *image) +eng_image_animated_loop_type_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -3616,7 +3616,7 @@ eng_image_animated_loop_type_get(void *data __UNUSED__, void *image) } static int -eng_image_animated_loop_count_get(void *data __UNUSED__, void *image) +eng_image_animated_loop_count_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -3630,7 +3630,7 @@ eng_image_animated_loop_count_get(void *data __UNUSED__, void *image) } static double -eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int start_frame, int frame_num) +eng_image_animated_frame_duration_get(void *data EINA_UNUSED, void *image, int start_frame, int frame_num) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -3644,7 +3644,7 @@ eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int st } static Eina_Bool -eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index) +eng_image_animated_frame_set(void *data EINA_UNUSED, void *image, int frame_index) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -3661,7 +3661,7 @@ eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index } static Eina_Bool -eng_image_can_region_get(void *data __UNUSED__, void *image) +eng_image_can_region_get(void *data EINA_UNUSED, void *image) { Evas_GL_Image *gim = image; Image_Entry *im; @@ -3808,7 +3808,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_engine_wl_egl_log_dom); evas_gl_common_module_close(); diff --git a/legacy/evas/src/modules/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h similarity index 100% rename from legacy/evas/src/modules/engines/wayland_egl/evas_engine.h rename to src/modules/evas/engines/wayland_egl/evas_engine.h diff --git a/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c similarity index 100% rename from legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c rename to src/modules/evas/engines/wayland_egl/evas_wl_main.c diff --git a/legacy/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h b/src/modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h similarity index 100% rename from legacy/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h rename to src/modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h diff --git a/legacy/evas/src/modules/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c similarity index 96% rename from legacy/evas/src/modules/engines/wayland_shm/evas_engine.c rename to src/modules/evas/engines/wayland_shm/evas_engine.c index ed4e6b5374..e58ecc7f31 100644 --- a/legacy/evas/src/modules/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -31,8 +31,8 @@ int _evas_engine_way_shm_log_dom = -1; static void *_output_setup(int w, int h, int rotation, Eina_Bool alpha, void *dest); /* engine function prototypes */ -static void *eng_info(Evas *eo_evas __UNUSED__); -static void eng_info_free(Evas *eo_evas __UNUSED__, void *info); +static void *eng_info(Evas *eo_evas EINA_UNUSED); +static void eng_info_free(Evas *eo_evas EINA_UNUSED, void *info); static int eng_setup(Evas *eo_evas, void *info); static void eng_output_free(void *data); static void eng_output_resize(void *data, int w, int h); @@ -44,7 +44,7 @@ static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h); static void eng_output_flush(void *data); static void eng_output_idle_flush(void *data); -static Eina_Bool eng_canvas_alpha_get(void *data, void *context __UNUSED__); +static Eina_Bool eng_canvas_alpha_get(void *data, void *context EINA_UNUSED); /* local functions */ static void * @@ -75,7 +75,7 @@ _output_setup(int w, int h, int rotation, Eina_Bool alpha, void *dest) /* engine functions */ static void * -eng_info(Evas *eo_evas __UNUSED__) +eng_info(Evas *eo_evas EINA_UNUSED) { Evas_Engine_Info_Wayland_Shm *info; @@ -91,7 +91,7 @@ eng_info(Evas *eo_evas __UNUSED__) } static void -eng_info_free(Evas *eo_evas __UNUSED__, void *info) +eng_info_free(Evas *eo_evas EINA_UNUSED, void *info) { Evas_Engine_Info_Wayland_Shm *in; @@ -307,7 +307,7 @@ eng_output_idle_flush(void *data) } static Eina_Bool -eng_canvas_alpha_get(void *data, void *context __UNUSED__) +eng_canvas_alpha_get(void *data, void *context EINA_UNUSED) { Render_Engine *re = NULL; @@ -355,7 +355,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_engine_way_shm_log_dom); } diff --git a/legacy/evas/src/modules/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h similarity index 95% rename from legacy/evas/src/modules/engines/wayland_shm/evas_engine.h rename to src/modules/evas/engines/wayland_shm/evas_engine.h index 8af227d37f..8828b2771d 100644 --- a/legacy/evas/src/modules/engines/wayland_shm/evas_engine.h +++ b/src/modules/evas/engines/wayland_shm/evas_engine.h @@ -38,12 +38,12 @@ extern int _evas_engine_way_shm_log_dom; # define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_way_shm_log_dom, __VA_ARGS__) typedef struct _Outbuf Outbuf; -struct _Outbuf +struct _Outbuf { int w, h; int rotation; - struct + struct { void *dest; @@ -57,7 +57,7 @@ void evas_outbuf_free(Outbuf *ob); void evas_outbuf_resize(Outbuf *ob, int w, int h); Outbuf *evas_outbuf_setup(int w, int h, int rot, Eina_Bool alpha, void *dest); RGBA_Image *evas_outbuf_new_region_for_update(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); -void evas_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, int x __UNUSED__, int y, int w, int h); +void evas_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h); void evas_outbuf_free_region_for_update(Outbuf *ob, RGBA_Image *update); #endif diff --git a/legacy/evas/src/modules/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c similarity index 100% rename from legacy/evas/src/modules/engines/wayland_shm/evas_outbuf.c rename to src/modules/evas/engines/wayland_shm/evas_outbuf.c diff --git a/legacy/evas/src/modules/loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/loaders/bmp/evas_image_load_bmp.c similarity index 99% rename from legacy/evas/src/modules/loaders/bmp/evas_image_load_bmp.c rename to src/modules/evas/loaders/bmp/evas_image_load_bmp.c index 562f17227c..173561b037 100644 --- a/legacy/evas/src/modules/loaders/bmp/evas_image_load_bmp.c +++ b/src/modules/evas/loaders/bmp/evas_image_load_bmp.c @@ -101,7 +101,7 @@ read_mem(unsigned char *map, size_t length, size_t *position, void *buffer, int } static Eina_Bool -evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map = NULL; @@ -378,7 +378,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key } static Eina_Bool -evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map = NULL; @@ -1476,7 +1476,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/eet/evas_image_load_eet.c b/src/modules/evas/loaders/eet/evas_image_load_eet.c similarity index 98% rename from legacy/evas/src/modules/loaders/eet/evas_image_load_eet.c rename to src/modules/evas/loaders/eet/evas_image_load_eet.c index f86246a92c..7526420bc6 100644 --- a/legacy/evas/src/modules/loaders/eet/evas_image_load_eet.c +++ b/src/modules/evas/loaders/eet/evas_image_load_eet.c @@ -161,7 +161,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/generic/evas_image_load_generic.c b/src/modules/evas/loaders/generic/evas_image_load_generic.c similarity index 99% rename from legacy/evas/src/modules/loaders/generic/evas_image_load_generic.c rename to src/modules/evas/loaders/generic/evas_image_load_generic.c index ee704d568e..8a9473eeaa 100644 --- a/legacy/evas/src/modules/loaders/generic/evas_image_load_generic.c +++ b/src/modules/evas/loaders/generic/evas_image_load_generic.c @@ -412,7 +412,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c similarity index 99% rename from legacy/evas/src/modules/loaders/gif/evas_image_load_gif.c rename to src/modules/evas/loaders/gif/evas_image_load_gif.c index 18a6e237bf..f630988fe9 100644 --- a/legacy/evas/src/modules/loaders/gif/evas_image_load_gif.c +++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c @@ -675,7 +675,7 @@ evas_image_load_file_data_gif_internal(Image_Entry *ie, Image_Entry_Frame *frame } static Eina_Bool -evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { int fd; GifFileType *gif; @@ -882,7 +882,7 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde } static Eina_Bool -evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { int cur_frame_index; Image_Entry_Frame *frame = NULL; @@ -1077,7 +1077,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/ico/evas_image_load_ico.c b/src/modules/evas/loaders/ico/evas_image_load_ico.c similarity index 99% rename from legacy/evas/src/modules/loaders/ico/evas_image_load_ico.c rename to src/modules/evas/loaders/ico/evas_image_load_ico.c index 4239407cb5..790282c13b 100644 --- a/legacy/evas/src/modules/loaders/ico/evas_image_load_ico.c +++ b/src/modules/evas/loaders/ico/evas_image_load_ico.c @@ -786,7 +786,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c similarity index 99% rename from legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c rename to src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c index a34fba4942..06705b2acd 100644 --- a/legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c +++ b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c @@ -66,7 +66,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo) } static void -_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) +_JPEGErrorHandler(j_common_ptr cinfo EINA_UNUSED) { /* emptr errmgr; */ @@ -77,7 +77,7 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) } static void -_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__, int msg_level __UNUSED__) +_JPEGErrorHandler2(j_common_ptr cinfo EINA_UNUSED, int msg_level EINA_UNUSED) { /* emptr errmgr; */ @@ -97,7 +97,7 @@ struct jpeg_membuf_src }; static void -_evas_jpeg_membuf_src_init(j_decompress_ptr cinfo __UNUSED__) +_evas_jpeg_membuf_src_init(j_decompress_ptr cinfo EINA_UNUSED) { } @@ -1241,7 +1241,7 @@ evas_image_load_file_data_jpeg_alpha_internal(Image_Entry *ie, FILE *f, int *err static Eina_Bool evas_image_load_file_head_jpeg(Image_Entry *ie, - const char *file, const char *key __UNUSED__, + const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; @@ -1274,7 +1274,7 @@ evas_image_load_file_head_jpeg(Image_Entry *ie, static Eina_Bool evas_image_load_file_data_jpeg(Image_Entry *ie, - const char *file, const char *key __UNUSED__, + const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; @@ -1314,7 +1314,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c b/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c similarity index 98% rename from legacy/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c rename to src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c index 393e407e49..a7c5acfb5c 100644 --- a/legacy/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c +++ b/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c @@ -67,7 +67,7 @@ static size_t pmaps_buffer_raw_update(Pmaps_Buffer *b); static int pmaps_buffer_comment_skip(Pmaps_Buffer *b); static Eina_Bool -evas_image_load_file_head_pmaps(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_pmaps(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Pmaps_Buffer b; @@ -92,7 +92,7 @@ evas_image_load_file_head_pmaps(Image_Entry *ie, const char *file, const char *k } static Eina_Bool -evas_image_load_file_data_pmaps(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_pmaps(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Pmaps_Buffer b; int pixels; @@ -569,7 +569,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/png/evas_image_load_png.c b/src/modules/evas/loaders/png/evas_image_load_png.c similarity index 98% rename from legacy/evas/src/modules/loaders/png/evas_image_load_png.c rename to src/modules/evas/loaders/png/evas_image_load_png.c index 3007a57311..e2623019f0 100644 --- a/legacy/evas/src/modules/loaders/png/evas_image_load_png.c +++ b/src/modules/evas/loaders/png/evas_image_load_png.c @@ -40,7 +40,7 @@ static Evas_Image_Load_Func evas_image_load_png_func = }; static Eina_Bool -evas_image_load_file_head_png(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_png(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { png_uint_32 w32, h32; FILE *f; @@ -139,7 +139,7 @@ evas_image_load_file_head_png(Image_Entry *ie, const char *file, const char *key } static Eina_Bool -evas_image_load_file_data_png(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_png(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { unsigned char *surface; png_uint_32 w32, h32; @@ -307,7 +307,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/psd/evas_image_load_psd.c b/src/modules/evas/loaders/psd/evas_image_load_psd.c similarity index 98% rename from legacy/evas/src/modules/loaders/psd/evas_image_load_psd.c rename to src/modules/evas/loaders/psd/evas_image_load_psd.c index 4449db0934..414b02dd3e 100644 --- a/legacy/evas/src/modules/loaders/psd/evas_image_load_psd.c +++ b/src/modules/evas/loaders/psd/evas_image_load_psd.c @@ -151,7 +151,7 @@ is_psd(PSD_Header *header) static Eina_Bool evas_image_load_file_head_psd(Image_Entry *ie, const char *FileName, - const char *key __UNUSED__, int *error) + const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map; @@ -199,7 +199,7 @@ evas_image_load_file_head_psd(Image_Entry *ie, const char *FileName, static unsigned int read_compressed_channel(const unsigned char *map, size_t length, size_t *position, - const unsigned int channel_length __UNUSED__, + const unsigned int channel_length EINA_UNUSED, unsigned int size, unsigned char* channel) { @@ -247,7 +247,7 @@ read_compressed_channel(const unsigned char *map, size_t length, size_t *positio Eina_Bool -psd_get_data(Image_Entry *ie __UNUSED__, +psd_get_data(Image_Entry *ie EINA_UNUSED, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, unsigned char *buffer, Eina_Bool compressed, @@ -502,7 +502,7 @@ psd_get_data(Image_Entry *ie __UNUSED__, Eina_Bool -get_single_channel(Image_Entry *ie __UNUSED__, +get_single_channel(Image_Entry *ie EINA_UNUSED, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, unsigned char *buffer, @@ -869,7 +869,7 @@ read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_ static Eina_Bool evas_image_load_file_data_psd(Image_Entry *ie, const char *file, - const char *key __UNUSED__, + const char *key EINA_UNUSED, int *error) { Eina_File *f; @@ -979,7 +979,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/svg/evas_image_load_esvg.c b/src/modules/evas/loaders/svg/evas_image_load_esvg.c similarity index 98% rename from legacy/evas/src/modules/loaders/svg/evas_image_load_esvg.c rename to src/modules/evas/loaders/svg/evas_image_load_esvg.c index c6c8455ff2..ba64f5cf76 100644 --- a/legacy/evas/src/modules/loaders/svg/evas_image_load_esvg.c +++ b/src/modules/evas/loaders/svg/evas_image_load_esvg.c @@ -66,7 +66,7 @@ static inline Eina_Bool evas_image_load_file_is_svg(const char *file) } static Eina_Bool -evas_image_load_file_head_svg(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_svg(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Ender_Element *e; int w, h; @@ -142,7 +142,7 @@ evas_image_load_file_head_svg(Image_Entry *ie, const char *file, const char *key /** FIXME: All evas loaders need to be tightened up **/ static Eina_Bool -evas_image_load_file_data_svg(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_svg(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { DATA32 *pixels; Ender_Element *e; @@ -283,7 +283,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { if (!esvg_initialized) return; esvg_shutdown(); diff --git a/legacy/evas/src/modules/loaders/tga/evas_image_load_tga.c b/src/modules/evas/loaders/tga/evas_image_load_tga.c similarity index 99% rename from legacy/evas/src/modules/loaders/tga/evas_image_load_tga.c rename to src/modules/evas/loaders/tga/evas_image_load_tga.c index bab169b1f1..221aeb44ce 100644 --- a/legacy/evas/src/modules/loaders/tga/evas_image_load_tga.c +++ b/src/modules/evas/loaders/tga/evas_image_load_tga.c @@ -70,7 +70,7 @@ static Evas_Image_Load_Func evas_image_load_tga_func = }; static Eina_Bool -evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; unsigned char *seg = NULL, *filedata; @@ -169,7 +169,7 @@ close_file: } static Eina_Bool -evas_image_load_file_data_tga(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_tga(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; unsigned char *seg = NULL, *filedata; @@ -571,7 +571,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/loaders/tiff/evas_image_load_tiff.c similarity index 98% rename from legacy/evas/src/modules/loaders/tiff/evas_image_load_tiff.c rename to src/modules/evas/loaders/tiff/evas_image_load_tiff.c index e17d5a61dc..f2f1c595a8 100644 --- a/legacy/evas/src/modules/loaders/tiff/evas_image_load_tiff.c +++ b/src/modules/evas/loaders/tiff/evas_image_load_tiff.c @@ -49,7 +49,7 @@ struct TIFFRGBAImage_Extra { }; static Eina_Bool -evas_image_load_file_head_tiff(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_tiff(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { char txt[1024]; TIFFRGBAImage tiff_image; @@ -132,7 +132,7 @@ evas_image_load_file_head_tiff(Image_Entry *ie, const char *file, const char *ke } static Eina_Bool -evas_image_load_file_data_tiff(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_tiff(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { char txt[1024]; TIFFRGBAImage_Extra rgba_image; @@ -302,7 +302,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { eina_log_domain_unregister(_evas_loader_tiff_log_dom); } diff --git a/legacy/evas/src/modules/loaders/wbmp/evas_image_load_wbmp.c b/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c similarity index 97% rename from legacy/evas/src/modules/loaders/wbmp/evas_image_load_wbmp.c rename to src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c index 54e28d5014..562320b917 100644 --- a/legacy/evas/src/modules/loaders/wbmp/evas_image_load_wbmp.c +++ b/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c @@ -43,7 +43,7 @@ read_mb(unsigned int *data, void *map, size_t length, size_t *position) } static Eina_Bool -evas_image_load_file_head_wbmp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_wbmp(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map = NULL; @@ -97,7 +97,7 @@ bail: } static Eina_Bool -evas_image_load_file_data_wbmp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_wbmp(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { Eina_File *f; void *map = NULL; @@ -187,7 +187,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/webp/evas_image_load_webp.c b/src/modules/evas/loaders/webp/evas_image_load_webp.c similarity index 96% rename from legacy/evas/src/modules/loaders/webp/evas_image_load_webp.c rename to src/modules/evas/loaders/webp/evas_image_load_webp.c index c0506032c2..bb59f1629d 100644 --- a/legacy/evas/src/modules/loaders/webp/evas_image_load_webp.c +++ b/src/modules/evas/loaders/webp/evas_image_load_webp.c @@ -27,7 +27,7 @@ static Evas_Image_Load_Func evas_image_load_webp_func = static Eina_Bool -evas_image_load_file_head_webp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_head_webp(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { WebPDecoderConfig config; FILE *f; @@ -68,7 +68,7 @@ evas_image_load_file_head_webp(Image_Entry *ie, const char *file, const char *ke } static Eina_Bool -evas_image_load_file_data_webp(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error) +evas_image_load_file_data_webp(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int *error) { FILE *f; size_t file_size; @@ -148,7 +148,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/loaders/xpm/evas_image_load_xpm.c similarity index 99% rename from legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c rename to src/modules/evas/loaders/xpm/evas_image_load_xpm.c index 4464ed0533..f1f78b26e0 100644 --- a/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c +++ b/src/modules/evas/loaders/xpm/evas_image_load_xpm.c @@ -126,7 +126,7 @@ struct _CMap { }; Eina_Rbtree_Direction -_cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data __UNUSED__) +_cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data EINA_UNUSED) { CMap *lcm; CMap *rcm; @@ -140,7 +140,7 @@ _cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data } int -_cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length __UNUSED__, void *data __UNUSED__) +_cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length EINA_UNUSED, void *data EINA_UNUSED) { CMap *root = EINA_RBTREE_CONTAINER_GET(node, CMap); @@ -149,7 +149,7 @@ _cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length __UNUSED__ /** FIXME: clean this up and make more efficient **/ static Eina_Bool -evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UNUSED__, int load_data, int *error) +evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key EINA_UNUSED, int load_data, int *error) { DATA32 *ptr, *end, *head; Eina_File *f; @@ -705,7 +705,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { if (rgb_txt) { diff --git a/legacy/evas/src/modules/savers/eet/evas_image_save_eet.c b/src/modules/evas/savers/eet/evas_image_save_eet.c similarity index 97% rename from legacy/evas/src/modules/savers/eet/evas_image_save_eet.c rename to src/modules/evas/savers/eet/evas_image_save_eet.c index 4eb717647e..26d58d47ca 100644 --- a/legacy/evas/src/modules/savers/eet/evas_image_save_eet.c +++ b/src/modules/evas/savers/eet/evas_image_save_eet.c @@ -60,7 +60,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c b/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c similarity index 93% rename from legacy/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c rename to src/modules/evas/savers/jpeg/evas_image_save_jpeg.c index c01dbdde8c..c653c77cde 100644 --- a/legacy/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c +++ b/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c @@ -31,7 +31,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo) } static void -_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) +_JPEGErrorHandler(j_common_ptr cinfo EINA_UNUSED) { /* emptr errmgr; */ @@ -40,7 +40,7 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) } static void -_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__, int msg_level __UNUSED__) +_JPEGErrorHandler2(j_common_ptr cinfo EINA_UNUSED, int msg_level EINA_UNUSED) { /* emptr errmgr; */ @@ -121,7 +121,7 @@ save_image_jpeg(RGBA_Image *im, const char *file, int quality) return 1; } -static int evas_image_save_file_jpeg(RGBA_Image *im, const char *file, const char *key __UNUSED__, int quality, int compress __UNUSED__) +static int evas_image_save_file_jpeg(RGBA_Image *im, const char *file, const char *key EINA_UNUSED, int quality, int compress EINA_UNUSED) { return save_image_jpeg(im, file, quality); } @@ -135,7 +135,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/savers/png/evas_image_save_png.c b/src/modules/evas/savers/png/evas_image_save_png.c similarity index 97% rename from legacy/evas/src/modules/savers/png/evas_image_save_png.c rename to src/modules/evas/savers/png/evas_image_save_png.c index 734890c776..ab75681978 100644 --- a/legacy/evas/src/modules/savers/png/evas_image_save_png.c +++ b/src/modules/evas/savers/png/evas_image_save_png.c @@ -156,7 +156,7 @@ save_image_png(RGBA_Image *im, const char *file, int do_compress, int interlace) } static int -evas_image_save_file_png(RGBA_Image *im, const char *file, const char *key __UNUSED__, int quality __UNUSED__, int do_compress) +evas_image_save_file_png(RGBA_Image *im, const char *file, const char *key EINA_UNUSED, int quality EINA_UNUSED, int do_compress) { return save_image_png(im, file, do_compress, 0); } @@ -170,7 +170,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/modules/savers/tiff/evas_image_save_tiff.c b/src/modules/evas/savers/tiff/evas_image_save_tiff.c similarity index 93% rename from legacy/evas/src/modules/savers/tiff/evas_image_save_tiff.c rename to src/modules/evas/savers/tiff/evas_image_save_tiff.c index 8148f519b5..9cef969dd0 100644 --- a/legacy/evas/src/modules/savers/tiff/evas_image_save_tiff.c +++ b/src/modules/evas/savers/tiff/evas_image_save_tiff.c @@ -11,7 +11,7 @@ static Evas_Image_Save_Func evas_image_save_tiff_func = }; static int -save_image_tiff(RGBA_Image *im, const char *file, int compress __UNUSED__, int interlace __UNUSED__) +save_image_tiff(RGBA_Image *im, const char *file, int compress EINA_UNUSED, int interlace EINA_UNUSED) { TIFF *tif = NULL; uint8 *buf = NULL; @@ -102,7 +102,7 @@ save_image_tiff(RGBA_Image *im, const char *file, int compress __UNUSED__, int i return 1; } -static int evas_image_save_file_tiff(RGBA_Image *im, const char *file, const char *key __UNUSED__, int quality __UNUSED__, int compress) +static int evas_image_save_file_tiff(RGBA_Image *im, const char *file, const char *key EINA_UNUSED, int quality EINA_UNUSED, int compress) { return save_image_tiff(im, file, compress, 0); } @@ -116,7 +116,7 @@ module_open(Evas_Module *em) } static void -module_close(Evas_Module *em __UNUSED__) +module_close(Evas_Module *em EINA_UNUSED) { } diff --git a/legacy/evas/src/static_deps/liblinebreak/AUTHORS b/src/static_libs/liblinebreak/AUTHORS similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/AUTHORS rename to src/static_libs/liblinebreak/AUTHORS diff --git a/legacy/evas/src/static_deps/liblinebreak/ChangeLog b/src/static_libs/liblinebreak/ChangeLog similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/ChangeLog rename to src/static_libs/liblinebreak/ChangeLog diff --git a/legacy/evas/src/static_deps/liblinebreak/LICENCE b/src/static_libs/liblinebreak/LICENCE similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/LICENCE rename to src/static_libs/liblinebreak/LICENCE diff --git a/legacy/evas/src/static_deps/liblinebreak/LineBreak1.sed b/src/static_libs/liblinebreak/LineBreak1.sed similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/LineBreak1.sed rename to src/static_libs/liblinebreak/LineBreak1.sed diff --git a/legacy/evas/src/static_deps/liblinebreak/LineBreak2.sed b/src/static_libs/liblinebreak/LineBreak2.sed similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/LineBreak2.sed rename to src/static_libs/liblinebreak/LineBreak2.sed diff --git a/legacy/evas/src/static_deps/liblinebreak/NEWS b/src/static_libs/liblinebreak/NEWS similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/NEWS rename to src/static_libs/liblinebreak/NEWS diff --git a/legacy/evas/src/static_deps/liblinebreak/README b/src/static_libs/liblinebreak/README similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/README rename to src/static_libs/liblinebreak/README diff --git a/legacy/evas/src/static_deps/liblinebreak/filter_dup.c b/src/static_libs/liblinebreak/filter_dup.c similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/filter_dup.c rename to src/static_libs/liblinebreak/filter_dup.c diff --git a/legacy/evas/src/static_deps/liblinebreak/gen_linebreak_data.sh b/src/static_libs/liblinebreak/gen_linebreak_data.sh similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/gen_linebreak_data.sh rename to src/static_libs/liblinebreak/gen_linebreak_data.sh diff --git a/legacy/evas/src/static_deps/liblinebreak/gen_wordbreak_data.sh b/src/static_libs/liblinebreak/gen_wordbreak_data.sh similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/gen_wordbreak_data.sh rename to src/static_libs/liblinebreak/gen_wordbreak_data.sh diff --git a/legacy/evas/src/static_deps/liblinebreak/linebreak.c b/src/static_libs/liblinebreak/linebreak.c similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/linebreak.c rename to src/static_libs/liblinebreak/linebreak.c diff --git a/legacy/evas/src/static_deps/liblinebreak/linebreak.h b/src/static_libs/liblinebreak/linebreak.h similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/linebreak.h rename to src/static_libs/liblinebreak/linebreak.h diff --git a/legacy/evas/src/static_deps/liblinebreak/linebreakdata.c b/src/static_libs/liblinebreak/linebreakdata.c similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/linebreakdata.c rename to src/static_libs/liblinebreak/linebreakdata.c diff --git a/legacy/evas/src/static_deps/liblinebreak/linebreakdata1.tmpl b/src/static_libs/liblinebreak/linebreakdata1.tmpl similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/linebreakdata1.tmpl rename to src/static_libs/liblinebreak/linebreakdata1.tmpl diff --git a/legacy/evas/src/static_deps/liblinebreak/linebreakdata2.tmpl b/src/static_libs/liblinebreak/linebreakdata2.tmpl similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/linebreakdata2.tmpl rename to src/static_libs/liblinebreak/linebreakdata2.tmpl diff --git a/legacy/evas/src/static_deps/liblinebreak/linebreakdata3.tmpl b/src/static_libs/liblinebreak/linebreakdata3.tmpl similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/linebreakdata3.tmpl rename to src/static_libs/liblinebreak/linebreakdata3.tmpl diff --git a/legacy/evas/src/static_deps/liblinebreak/linebreakdef.c b/src/static_libs/liblinebreak/linebreakdef.c similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/linebreakdef.c rename to src/static_libs/liblinebreak/linebreakdef.c diff --git a/legacy/evas/src/static_deps/liblinebreak/linebreakdef.h b/src/static_libs/liblinebreak/linebreakdef.h similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/linebreakdef.h rename to src/static_libs/liblinebreak/linebreakdef.h diff --git a/legacy/evas/src/static_deps/liblinebreak/sort_numeric_hex.py b/src/static_libs/liblinebreak/sort_numeric_hex.py similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/sort_numeric_hex.py rename to src/static_libs/liblinebreak/sort_numeric_hex.py diff --git a/legacy/evas/src/static_deps/liblinebreak/wordbreak.c b/src/static_libs/liblinebreak/wordbreak.c similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/wordbreak.c rename to src/static_libs/liblinebreak/wordbreak.c diff --git a/legacy/evas/src/static_deps/liblinebreak/wordbreak.h b/src/static_libs/liblinebreak/wordbreak.h similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/wordbreak.h rename to src/static_libs/liblinebreak/wordbreak.h diff --git a/legacy/evas/src/static_deps/liblinebreak/wordbreakdata.x b/src/static_libs/liblinebreak/wordbreakdata.x similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/wordbreakdata.x rename to src/static_libs/liblinebreak/wordbreakdata.x diff --git a/legacy/evas/src/static_deps/liblinebreak/wordbreakdef.h b/src/static_libs/liblinebreak/wordbreakdef.h similarity index 100% rename from legacy/evas/src/static_deps/liblinebreak/wordbreakdef.h rename to src/static_libs/liblinebreak/wordbreakdef.h