summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "ecore: fix path comparison in Ecore_File test suite."devs/stefan/unit-test-debugStefan Schmidt2015-02-121-28/+5
| | | | This reverts commit 66c0f3261dab904fce533b0f7d30b1b374abd658.
* tests/evas: Disable segfaulting evas_object_mesh_loader_saverStefan Schmidt2015-02-121-1/+1
| | | | | | | This test case segfault on jenkins as well as on my devel machine. Disable until fixed. ref T2104
* eina: Fix MacOS X build with clang 3.6.Guilherme Lepsch2015-02-122-2/+3
| | | | | | | | | | | | | | Summary: printf contains and erroneous format specifier and cast missing LIBTOOLFLAGS for cocoa Reviewers: felipealmeida, larryolj, naguirre Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1912 Signed-off-by: Nicolas Aguirre <aguirre.nicolas@gmail.com>
* Revert "Evas GL: Add support for uniforms in the shaders"Jean-Philippe Andre2015-02-129-145/+76
| | | | This reverts commit 21d08f86e6087f7e30ff2015c7551c06e359bba9.
* Revert "Evas GL common: Use uniform instead of attribute for sample"Jean-Philippe Andre2015-02-1228-180/+235
| | | | | | | | This reverts commit 986b60eaf0175b3592883c85cfb6f5f5a280f31d. Added PUSH_SAMPLE for simplicity. It was dumb of me to use uniforms, so I added a comment to prevent other dumb people from making the same mistake later.
* Evas GL common: Improve code readability (simplify macro)Jean-Philippe Andre2015-02-1212-633/+142
| | | | | | | | | | | | | | | | The exact same ugly macro would appear hundreds of times in the GL code: GLERR(__FUNCTION__, __FILE__, __LINE__, ""); Instead, override the common GL functions iif GL_ERRORS is defined. This greatly simplifies code and removes tons of useless lines. Also, this will give better debugging output as the exact code line is printed, and the function name is also printed. Also, fix linking to the glerr function. This is a code cleanup. Hopefully I didn't break anything with this big operation of find & replace.
* Evas GL common: Simplify GL pipe code with macrosJean-Philippe Andre2015-02-121-150/+39
| | | | | | A lot of the code was just brutal copy & paste. Reduced by using simpler macros, which I believe are even more readable.
* Evas GL common: Call glGetUniformLocation as early as possibleJean-Philippe Andre2015-02-123-10/+39
| | | | | | | | This should speed up setting uniforms in the shaders, by storing their locations in the Evas_GL_Program description. I kept the previous solution with name as fallback, but it won't actually be used with the current shaders.
* Evas GL common: Use uniform instead of attribute for sampleJean-Philippe Andre2015-02-1228-233/+180
| | | | | | Image and texture programs "12", "21" and "22" used tex_sample as a texture attribute passed to the vertex shader. Instead of this seemingly hackish solution, use a vec2 uniform.
* evas - render - have lock point to allow for async obj walk + update addCarsten Haitzler (Rasterman)2015-02-1226-75/+488
| | | | | | | | | this adds a lock for when walking all the objects to generate render commands for an async render. this allows even the object tree walk plus update area caluclation to be moved off into async if every oject that can change canvas state actually does so correctly. this change adds all those lock block calls to synchronise with an async object tree walk.
* ecore-drm: Print error when taking control of a device failsChris Michael2015-02-111-0/+6
| | | | | | | | | Summary: If we send a dbus blocking message, and it returns an error then we should be printing out this error message @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
* eldbus: Fix formattingChris Michael2015-02-111-1/+2
| | | | | | Summary: No functional changes, just formatting Signed-off-by: Chris Michael <cp.michael@samsung.com>
* ecore-drm: Disable/Enable inputs if we release/aquire VT through logindChris Michael2015-02-111-0/+9
| | | | | | | | | Summary: Due to libinput processing events directly from evdev, we need to disable/enable input events when we release/acquire the vt. @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
* ecore-drm: Disable/Enable inputs if we release/acquire the VTChris Michael2015-02-111-0/+6
| | | | | | | | | Summary: Due to libinput process events directly from evdev, when we VT switch we should disable/enable inputs accordingly. @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
* evas: Evas_3D - iport/export of Obj format can be read even if obj-file does ↵Bogdan Devichev2015-02-1115-2654/+768
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not have normals or tex-coords. Summary: This commit fixed several bugs, and show what was be fixed. Bugs: - When designer save obj file in Blender, he/she can set flags (fig 1). Normals and UV coords flags was necessary for obj loader. Loader crushed when they are not set as true. It fixed by this commit. - Another loaders set default values to data which aren't in loading file, so mesh need more memory for unused data. It fixed by this commit for obj and will be fixed for another formats in future. - Saver saved incorrect data if normals or tex_coords was not set in mesh in evas. Now it fixed. - Saver failed if it save mesh without material. It fixed and in this case material file is not created now. - Also fixed some leaks and undefined behavior which valgrind shows. Example: - Example shows cases described above. Example use files saved with different flags for it. Resources: - man_mesh is replaced by several smaller file, to use them for showing new features and fixes. For example, similar to that models can be added when implement work with material for obj, work with different flags for obj loader/saver etc. (big count of man_meshes is to much memory). - texture for home is flipped, because of bug with texture in efl to see if tex_coords is incorrect. Test: - test should be rewritten in future, because another formats still use default values for normals and tex_coords. And test can not pass for all types of obj file because of standardization for any format in him. Test Plan: Test suit will be rewritten after correcting of other formats (they will set NULL to file when save an empty data (like mesh without normals)) Reviewers: Hermet, raster, cedric Reviewed By: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1957 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
* evas: example for Evas_3D color pickOleksandr Shcherbina2015-02-116-0/+6045
| | | | Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
* evas: Evas_3D - mechanism for finding node by color pick.Oleksandr Shcherbina2015-02-117-6/+242
| | | | | | | | | | | | | | | | | | | | Summary: See first part https://phab.enlightenment.org/D1811 (backend, gl) Add get/set for color pick mode at evas_3d_mesh and evas_3d_scene Add evas_3d_node_color_node_mesh_collect function to collect data at force rendering Add state flag for scene to avoid useless force rendering in case scene wasn't changed Add functionality for color pick in evas_3d_scene_pick method Reviewers: Hermet, raster, cedric Reviewed By: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1956 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
* evas: add image orient set/get API in software backend for now.kabeer khan2015-02-1110-1/+641
| | | | | | | | | | | | | | | | Summary: Added API's to rotate(0, 90, 180, 270), flip(horizontal, vertical, transpose, transverse) evas image object. Also added example to demonstrate this. Signed-off-by: kabeer khan <kabeer.khan@samsung.com> Reviewers: raster, stephenmhouston, cedric Subscribers: stephenmhouston, cedric Differential Revision: https://phab.enlightenment.org/D1950 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
* edje: add 3D models to edje_cc.perepelits.m2015-02-111-0/+96
| | | | Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
* ecore_con: add ecore con client functions for testing.Srivardhan Hebbar2015-02-111-8/+19
| | | | | | | | | | | | | | Summary: Added ecore con client functions to the existing cases to cover more functions. Reviewers: cedric Reviewed By: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1958 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
* eina: fix directory listing on windows when directory is empty.Nicolas Aguirre2015-02-111-7/+15
| | | | | | Using of INVALID_HANDLE_VALUE and ERROR_NO_MORE_FILES to handle this properlly. @fix
* ecore_con: EAGAIN is replaced by WSAEWOULDBLOCK on Windows.Guillaume Friloux2015-02-111-0/+4
|
* ecore: improve network events handling on Windows.Guillaume Friloux2015-02-112-6/+4
|
* ecore_con: do not load /etc/hosts on Windows.Guillaume Friloux2015-02-111-2/+3
|
* ecore: add FD_CLOSE, FD_ACCEPT and FD_CONNECT for sockets on Windows.Guillaume Friloux2015-02-111-0/+2
|
* ecore_con: make disconnects work on Windows.Guillaume Friloux2015-02-111-0/+7
|
* ecore_con: fix use of FormatMessage for error reporting on windows.Guillaume Friloux2015-02-111-3/+4
| | | | @fix
* ecore_con: silent warning with send() usage.Guillaume Friloux2015-02-111-8/+8
|
* ecore_con: use send() instead of write() for portability.Guillaume Friloux2015-02-111-5/+1
|
* ecore_con: use recv() instead of read for better portability.Guillaume Friloux2015-02-111-4/+6
|
* ecore_con: fix _ecore_con_server_flush on Windows.Guillaume Friloux2015-02-111-5/+35
| | | | @fix
* ecore_con: Fix checks from socket() and accept() under windows.Nicolas Aguirre2015-02-111-13/+25
| | | | import from Guillaume Friloux ecore's fork : https://github.com/gfriloux/ecore/commit/ab2d406a37c0ae205b6a934b7ea747f4b2baee81
* ecore_con: use SOCKET and not int for socket descriptors on win32Guillaume Friloux2015-02-111-0/+8
|
* ecore_con: use ioctlsocket() when building for windows.Guillaume Friloux2015-02-111-3/+43
| | | | | | | | | | fcntl() doesnt work under windows. References : - http://msdn.microsoft.com/en-us/library/windows/desktop/ms738573%28v=vs.85%29.aspx - http://msdn.microsoft.com/en-us/library/windows/desktop/ms740096%28v=vs.85%29.aspx imported from Guillaume Friloux ecore fork : https://github.com/gfriloux/ecore/commit/66da77d491d4f304767bac88d9ace4a5ff5f41e0
* ecore: directly allocating and freeing Ecore_Win32_Handler variable.michelle legrand2015-02-111-3/+3
| | | | | | There was no memory pool nor any function like that in fact. @fix
* eio: check that the file to be monitored is not an empty string.michelle legrand2015-02-111-0/+3
| | | | | | This fix segmentation faults on Windows caused by eio_monitor events. @fix
* eolian: add right extension to eolian_gen if we are on Windowsmichelle legrand2015-02-112-8/+3
| | | | | | | | In previous version of this commit we checked if the _WIN32 macro was defined. But now I am using EXEEXT from autotools to get eolian_gen extension. @fix
* eina: fix Eina_Log to only try to free non deleted log.michelle legrand2015-02-111-4/+10
| | | | @fix
* eina: correctly handle and report Eina_File error on Windows.Adrien Nader2015-02-111-1/+12
| | | | @fix
* eina: remove Eina_Counter and use provided Windows posix compatible ↵Adrien Nader2015-02-113-79/+0
| | | | implementation.
* eina: remove Windows specific thread implementation and rely on posix ↵Adrien Nader2015-02-117-905/+9
| | | | compliant library instead.
* ecore-drm should not use sscanf when getting logind vtMike Blumenkrantz2015-02-101-5/+12
| | | | | | this should be more robust for when something like "/dev/tty4" is passed @fix
* Eina tmpstr: Fix tmpstr_strlen.Tom Hacohen2015-02-101-1/+2
| | | | | | Weird. This is the code I had, I don't know how it got lost. Good job to Daniel Kolesa for spotting this.
* Evas masking: Force BLEND mode in case of image masking (GL)Jean-Philippe Andre2015-02-101-4/+10
| | | | | | | | This fixes some cases where the image has no alpha and COPY mode is used, but a mask is also applied. In that case, masking takes precedence and BLEND mode is used. @fix
* evas/software_x11: Restore legacy compatibility with old SLP DRMJean-Philippe Andre2015-02-101-22/+60
| | | | | | | I really REAAALLLY doubt that was necessary, but I'm still adding these few changes for legacy compatibility. This lib seriously should have had a stable API.
* evas/software_x11: replace drm_slp with tbmDongyeon Kim2015-02-101-60/+56
| | | | | | | | | | | | | | | | | | Summary: libdrm_slp has been replaced with libtbm, so modify xlib swapper to use tbm apis instead of drm_slp apis Test Plan: Local tests Reviewers: raster, Hermet, cedric, jpeg Reviewed By: jpeg Subscribers: cedric, wonsik Differential Revision: https://phab.enlightenment.org/D1932 Signed-off-by: Jean-Philippe Andre <jp.andre@samsung.com>
* Evas sw_x11: Fix previous patchesJean-Philippe Andre2015-02-101-13/+20
| | | | Restore support for Evas GL with the software engine (OSMesa).
* evas/software_x11: implement tbm native surface typeDongyeon Kim2015-02-106-28/+380
| | | | | | | | | | | | | | | | | Summary: This native surface type is based on the tbm surface used for the tizen platform. For the software_x11 backend, image data is retrieved from tbm surface and color format converted appropriately. This will only work when libtbm.so is present in the system. @feature Test Plan: Local tests Reviewers: raster, cedric, jpeg, Hermet Subscribers: wonsik, cedric Signed-off-by: Jean-Philippe Andre <jp.andre@samsung.com>
* evas/software_x11: implement native surface set for x11 typeDongyeon Kim2015-02-106-3/+225
| | | | | | | | | | | | | | | Summary: implement native surface set for EVAS_NATIVE_SURFACE_X11 type on software_x11 backend. @feature Test Plan: local tests on PC Reviewers: jpeg, cedric, raster, Hermet Subscribers: wonsik, cedric Signed-off-by: Jean-Philippe Andre <jp.andre@samsung.com>
* evas/gl_x11: introduce tbm native surface typeDongyeon Kim2015-02-1015-2/+461
| | | | | | | | | | | | | | Summary: This native surface type is based on the tbm surface used for the tizen platform. EGL_TIZEN_image_native_surface EGL extension is used to map tbm surface to an egl image @feature Reviewers: raster, cedric, jpeg Subscribers: cedric, wonsik Signed-off-by: Jean-Philippe Andre <jp.andre@samsung.com>