Revert "evas engine: return as soon as possible if the surface or context is not...
authorHermet Park <hermet@hermet.pe.kr>
Wed, 21 Sep 2016 04:06:18 +0000 (13:06 +0900)
committerHermet Park <hermet@hermet.pe.kr>
Wed, 21 Sep 2016 04:06:18 +0000 (13:06 +0900)
This reverts commit 2f158ebe65cc3d007c1eae0e25590f092931ee25.

misunderstood ^ operator.
pinged by jpeg.

previous code was correct.

src/modules/evas/engines/software_generic/evas_engine.c

index 9999361..62ad71a 100644 (file)
@@ -3655,14 +3655,18 @@ 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
+   // Unset surface/context
+   if ((!sfc) && (!ctx))
+     {
         eina_tls_set(gl_current_ctx_key, NULL);
         eina_tls_set(gl_current_sfc_key, NULL);
-        return 0;
+        return 1;
      }
 
    // Initialize Context if it hasn't been.