From 9ff072ca6707653ff437b6c8adecfb10c4314fc8 Mon Sep 17 00:00:00 2001 From: Sung Park Date: Tue, 30 Oct 2012 14:37:54 +0000 Subject: [PATCH] EvasGL: fix clip bug while computing coordinates for Evas GL direct rendering optimization. SVN revision: 78666 --- legacy/evas/ChangeLog | 6 ++++++ legacy/evas/NEWS | 1 + legacy/evas/src/modules/engines/gl_common/evas_gl_api.c | 8 ++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog index 52b25d218e..2ea9935c1d 100644 --- a/legacy/evas/ChangeLog +++ b/legacy/evas/ChangeLog @@ -1135,3 +1135,9 @@ 2012-10-26 ChunEon Park (Hermet) * Fixed event multi move memory leak. + +2012-10-30 Sung W. Park (sung_) + + * Fix clip bug while computing coordinates for Evas GL + direct rendering optimization. + diff --git a/legacy/evas/NEWS b/legacy/evas/NEWS index a051939f31..07669f881c 100644 --- a/legacy/evas/NEWS +++ b/legacy/evas/NEWS @@ -224,6 +224,7 @@ Fixes: * TGA loader detects false positives less and handles alpha TGAs better * repeat event flag not inherited from parent smart like pass events * texture size for nv12 format + * coordinate compute bug for Evas GL direct rendering. Improvements: diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_api.c index 99e0508b3f..a40d121459 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_api.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_api.c @@ -226,15 +226,15 @@ compute_gl_coordinates(Evas_Object *obj, int rot, int clip, { // Clip against original image object if (objc[0] < imgc[0]) objc[0] = imgc[0]; - if (objc[0] > imgc[2]) objc[0] = 0; + if (objc[0] > imgc[2]) objc[0] = imgc[2]; if (objc[1] < imgc[1]) objc[1] = imgc[1]; - if (objc[1] > imgc[3]) objc[1] = 0; + if (objc[1] > imgc[3]) objc[1] = imgc[3]; - if (objc[2] < imgc[0]) objc[0] = 0; + if (objc[2] < imgc[0]) objc[2] = imgc[0]; if (objc[2] > imgc[2]) objc[2] = imgc[2]; - if (objc[3] < imgc[1]) objc[1] = 0; + if (objc[3] < imgc[1]) objc[3] = imgc[1]; if (objc[3] > imgc[3]) objc[3] = imgc[3]; }