evas engine: return as soon as possible if the surface or context is not valid.
authorHermet Park <hermet@hermet.pe.kr>
Wed, 21 Sep 2016 03:24:49 +0000 (12:24 +0900)
committerHermet Park <hermet@hermet.pe.kr>
Wed, 21 Sep 2016 03:24:49 +0000 (12:24 +0900)
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

index 62ad71a..9999361 100644 (file)
@@ -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.