diff options
| author | Hermet Park <hermet@hermet.pe.kr> | 2016-09-21 12:24:49 +0900 |
|---|---|---|
| committer | Hermet Park <hermet@hermet.pe.kr> | 2016-09-21 12:24:49 +0900 |
| commit | 2f158ebe65cc3d007c1eae0e25590f092931ee25 (patch) | |
| tree | aa6592d359c706514411d5fe8db45171b34f6a9a | |
| parent | 10293e652055a5e741f3b9f87c14e7919bb2d267 (diff) | |
| download | efl-2f158ebe65cc3d007c1eae0e25590f092931ee25.tar.gz | |
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.
| -rw-r--r-- | src/modules/evas/engines/software_generic/evas_engine.c | 10 |
1 files 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 62ad71aa11..9999361b40 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. |