summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjutty.lee <jutty.lee@samsung.com>2016-12-20 18:02:45 +0900
committerHaegeun Park <haegeun.park@samsung.com>2017-01-11 18:20:39 +0900
commit49abf8317ec8f6a97e2cea9618dd13ab73defb2d (patch)
tree4a0973f48b3e405b51b4e5385b183eac47a1e71d
parent40476f99410709786df7fe6fb1185b59e1380859 (diff)
evas/gl_common: Check havestuff before threading (fix for glviewshadertest)devs/sung/evas_gl_thread
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index a4b158355f..402e6be748 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -3114,7 +3114,6 @@ _orig_shader_array_flush(Evas_Engine_GL_Context *gc)
3114 Eina_Bool setclip; 3114 Eina_Bool setclip;
3115 Eina_Bool fbo = EINA_FALSE; 3115 Eina_Bool fbo = EINA_FALSE;
3116 3116
3117 if (!gc->havestuff) return;
3118 gw = gc->w; 3117 gw = gc->w;
3119 gh = gc->h; 3118 gh = gc->h;
3120 if (!((gc->pipe[0].shader.surface == gc->def_surface) || 3119 if (!((gc->pipe[0].shader.surface == gc->def_surface) ||
@@ -3822,6 +3821,8 @@ _gl_thread_shader_array_flush(void *data)
3822static void 3821static void
3823shader_array_flush(Evas_Engine_GL_Context *gc) 3822shader_array_flush(Evas_Engine_GL_Context *gc)
3824{ 3823{
3824 if (!gc->havestuff) return;
3825
3825 if (!evas_gl_thread_enabled()) 3826 if (!evas_gl_thread_enabled())
3826 { 3827 {
3827 _orig_shader_array_flush(gc); 3828 _orig_shader_array_flush(gc);