hermet pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2f158ebe65cc3d007c1eae0e25590f092931ee25

commit 2f158ebe65cc3d007c1eae0e25590f092931ee25
Author: Hermet Park <her...@hermet.pe.kr>
Date:   Wed Sep 21 12:24:49 2016 +0900

    evas engine: return as soon as possible if the surface or context is not 
valid.
    
    And later, the surface and context are accessed.
    So both of arguments should be valid necessarily.
---
 src/modules/evas/engines/software_generic/evas_engine.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/modules/evas/engines/software_generic/evas_engine.c 
b/src/modules/evas/engines/software_generic/evas_engine.c
index 62ad71a..9999361 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3655,18 +3655,14 @@ eng_gl_make_current(void *data EINA_UNUSED, void 
*surface, void *context)
 
    _tls_check();
 
-   if ((!sfc) ^ (!ctx))
+   if ((!sfc) || (!ctx))
      {
         ERR("Evas GL on SW engine does not support surfaceless contexts.");
-        return 0;
-     }
 
-   // Unset surface/context
-   if ((!sfc) && (!ctx))
-     {
+        // Unset surface/context
         eina_tls_set(gl_current_ctx_key, NULL);
         eina_tls_set(gl_current_sfc_key, NULL);
-        return 1;
+        return 0;
      }
 
    // Initialize Context if it hasn't been.

-- 


Reply via email to