summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHermet Park <hermet@hermet.pe.kr>2016-09-21 13:06:18 +0900
committerHermet Park <hermet@hermet.pe.kr>2016-09-21 13:06:18 +0900
commit545161d9546d1a80ca5ffd31cbc3b4d0cae335f8 (patch)
tree146291b7417d2054f26a5123edfa470d863e87fa /src
parent2f158ebe65cc3d007c1eae0e25590f092931ee25 (diff)
Revert "evas engine: return as soon as possible if the surface or context is not valid."
This reverts commit 2f158ebe65cc3d007c1eae0e25590f092931ee25. misunderstood ^ operator. pinged by jpeg. previous code was correct.
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 9999361b40..62ad71aa11 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3655,14 +3655,18 @@ eng_gl_make_current(void *data EINA_UNUSED, void *surface, void *context)
3655 3655
3656 _tls_check(); 3656 _tls_check();
3657 3657
3658 if ((!sfc) || (!ctx)) 3658 if ((!sfc) ^ (!ctx))
3659 { 3659 {
3660 ERR("Evas GL on SW engine does not support surfaceless contexts."); 3660 ERR("Evas GL on SW engine does not support surfaceless contexts.");
3661 return 0;
3662 }
3661 3663
3662 // Unset surface/context 3664 // Unset surface/context
3665 if ((!sfc) && (!ctx))
3666 {
3663 eina_tls_set(gl_current_ctx_key, NULL); 3667 eina_tls_set(gl_current_ctx_key, NULL);
3664 eina_tls_set(gl_current_sfc_key, NULL); 3668 eina_tls_set(gl_current_sfc_key, NULL);
3665 return 0; 3669 return 1;
3666 } 3670 }
3667 3671
3668 // Initialize Context if it hasn't been. 3672 // Initialize Context if it hasn't been.