summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-05 16:29:01 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-06 09:12:28 +0900
commit4b10cf2e40b030c121f5ddefff4983f34e4632be (patch)
treef311b977840a7b5aa377a857bc83eeaf366a6f79 /src/modules
parentc0514d948a1cf56d5fc933ee6502eccf08c0a131 (diff)
filters: Fix GL support aka. cedric's bork
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c7
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c6
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_engine_filter.h16
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_filter_blend.c7
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_filter_blur.c7
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_filter_curve.c7
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_filter_displace.c7
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_filter_fill.c7
-rw-r--r--src/modules/evas/engines/gl_generic/filters/gl_filter_mask.c7
9 files changed, 32 insertions, 39 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c
index 2bd9cb3..93f58b6 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c
@@ -37,7 +37,7 @@ struct _Ector_GL_Buffer_Map
37 37
38struct _Evas_Ector_GL_Buffer_Data 38struct _Evas_Ector_GL_Buffer_Data
39{ 39{
40 Render_Output_GL_Generic *re; 40 Render_Engine_GL_Generic *re;
41 Evas_GL_Image *glim; 41 Evas_GL_Image *glim;
42 Eina_Bool alpha_only, was_render; 42 Eina_Bool alpha_only, was_render;
43 Ector_GL_Buffer_Map *maps; 43 Ector_GL_Buffer_Map *maps;
@@ -109,7 +109,7 @@ _evas_ector_gl_buffer_gl_buffer_prepare(Eo *obj, Evas_Ector_GL_Buffer_Data *pd,
109 int w, int h, Efl_Gfx_Colorspace cspace, 109 int w, int h, Efl_Gfx_Colorspace cspace,
110 Ector_Buffer_Flag flags EINA_UNUSED) 110 Ector_Buffer_Flag flags EINA_UNUSED)
111{ 111{
112 Render_Output_GL_Generic *re = engine; 112 Render_Engine_GL_Generic *re = engine;
113 Evas_Engine_GL_Context *gc; 113 Evas_Engine_GL_Context *gc;
114 Evas_GL_Image *im; 114 Evas_GL_Image *im;
115 115
@@ -125,8 +125,7 @@ _evas_ector_gl_buffer_gl_buffer_prepare(Eo *obj, Evas_Ector_GL_Buffer_Data *pd,
125 fail("Unsupported colorspace: %u", cspace); 125 fail("Unsupported colorspace: %u", cspace);
126 126
127 pd->re = re; 127 pd->re = re;
128 gc = re->window_gl_context_get(re->software.ob); 128 gc = gl_generic_context_find(re, 1);
129
130 im = evas_gl_common_image_surface_new(gc, w, h, EINA_TRUE, EINA_FALSE); 129 im = evas_gl_common_image_surface_new(gc, w, h, EINA_TRUE, EINA_FALSE);
131 if (!im) fail("Failed to create GL surface!"); 130 if (!im) fail("Failed to create GL surface!");
132 131
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 3bb4dde..eab7c9b 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -3084,7 +3084,7 @@ eng_image_surface_noscale_new(void *engine, int w, int h, int alpha)
3084//------------------------------------------------// 3084//------------------------------------------------//
3085 3085
3086static GL_Filter_Apply_Func 3086static GL_Filter_Apply_Func
3087_gfx_filter_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd) 3087_gfx_filter_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
3088{ 3088{
3089 GL_Filter_Apply_Func funcptr = NULL; 3089 GL_Filter_Apply_Func funcptr = NULL;
3090 3090
@@ -3107,7 +3107,7 @@ _gfx_filter_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
3107static Evas_Filter_Support 3107static Evas_Filter_Support
3108eng_gfx_filter_supports(void *engine, Evas_Filter_Command *cmd) 3108eng_gfx_filter_supports(void *engine, Evas_Filter_Command *cmd)
3109{ 3109{
3110 Render_Output_GL_Generic *re = engine; 3110 Render_Engine_GL_Generic *re = engine;
3111 3111
3112 if (!_gfx_filter_func_get(re, cmd)) 3112 if (!_gfx_filter_func_get(re, cmd))
3113 return pfunc.gfx_filter_supports(&re->software, cmd); 3113 return pfunc.gfx_filter_supports(&re->software, cmd);
@@ -3118,7 +3118,7 @@ eng_gfx_filter_supports(void *engine, Evas_Filter_Command *cmd)
3118static Eina_Bool 3118static Eina_Bool
3119eng_gfx_filter_process(void *engine, Evas_Filter_Command *cmd) 3119eng_gfx_filter_process(void *engine, Evas_Filter_Command *cmd)
3120{ 3120{
3121 Render_Output_GL_Generic *re = engine; 3121 Render_Engine_GL_Generic *re = engine;
3122 GL_Filter_Apply_Func funcptr; 3122 GL_Filter_Apply_Func funcptr;
3123 3123
3124 funcptr = _gfx_filter_func_get(re, cmd); 3124 funcptr = _gfx_filter_func_get(re, cmd);
diff --git a/src/modules/evas/engines/gl_generic/filters/gl_engine_filter.h b/src/modules/evas/engines/gl_generic/filters/gl_engine_filter.h
index 6c1de33..9cb59d1 100644
--- a/src/modules/evas/engines/gl_generic/filters/gl_engine_filter.h
+++ b/src/modules/evas/engines/gl_generic/filters/gl_engine_filter.h
@@ -8,14 +8,14 @@
8 8
9extern int _evas_engine_GL_log_dom; 9extern int _evas_engine_GL_log_dom;
10 10
11typedef Eina_Bool (* GL_Filter_Apply_Func) (Render_Output_GL_Generic *re, Evas_Filter_Command *cmd); 11typedef Eina_Bool (* GL_Filter_Apply_Func) (Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
12GL_Filter_Apply_Func gl_filter_blend_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd); 12GL_Filter_Apply_Func gl_filter_blend_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
13GL_Filter_Apply_Func gl_filter_blur_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd); 13GL_Filter_Apply_Func gl_filter_blur_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
14//GL_Filter_Apply_Func gl_filter_bump_func_get(Render_Output_GL_Generic *reEvas_Filter_Command *cmd); 14//GL_Filter_Apply_Func gl_filter_bump_func_get(Render_Engine_GL_Generic *reEvas_Filter_Command *cmd);
15GL_Filter_Apply_Func gl_filter_curve_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd); 15GL_Filter_Apply_Func gl_filter_curve_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
16GL_Filter_Apply_Func gl_filter_displace_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd); 16GL_Filter_Apply_Func gl_filter_displace_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
17GL_Filter_Apply_Func gl_filter_fill_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd); 17GL_Filter_Apply_Func gl_filter_fill_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
18GL_Filter_Apply_Func gl_filter_mask_func_get(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd); 18GL_Filter_Apply_Func gl_filter_mask_func_get(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd);
19//GL_Filter_Apply_Func gl_filter_transform_func_get(Evas_Filter_Command *cmd); 19//GL_Filter_Apply_Func gl_filter_transform_func_get(Evas_Filter_Command *cmd);
20 20
21#undef DBG 21#undef DBG
diff --git a/src/modules/evas/engines/gl_generic/filters/gl_filter_blend.c b/src/modules/evas/engines/gl_generic/filters/gl_filter_blend.c
index b2828ba..768b350 100644
--- a/src/modules/evas/engines/gl_generic/filters/gl_filter_blend.c
+++ b/src/modules/evas/engines/gl_generic/filters/gl_filter_blend.c
@@ -156,7 +156,7 @@ _mapped_blend(Evas_Engine_GL_Context *gc,
156} 156}
157 157
158static Eina_Bool 158static Eina_Bool
159_gl_filter_blend(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd) 159_gl_filter_blend(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
160{ 160{
161 Evas_Engine_GL_Context *gc; 161 Evas_Engine_GL_Context *gc;
162 Evas_GL_Image *image, *surface; 162 Evas_GL_Image *image, *surface;
@@ -165,8 +165,7 @@ _gl_filter_blend(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
165 165
166 DEBUG_TIME_BEGIN(); 166 DEBUG_TIME_BEGIN();
167 167
168 re->window_use(re->software.ob); 168 gc = gl_generic_context_find(re, 1);
169 gc = re->window_gl_context_get(re->software.ob);
170 169
171 image = evas_ector_buffer_drawable_image_get(cmd->input->buffer); 170 image = evas_ector_buffer_drawable_image_get(cmd->input->buffer);
172 EINA_SAFETY_ON_NULL_RETURN_VAL(image, EINA_FALSE); 171 EINA_SAFETY_ON_NULL_RETURN_VAL(image, EINA_FALSE);
@@ -247,7 +246,7 @@ _gl_filter_blend(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
247} 246}
248 247
249GL_Filter_Apply_Func 248GL_Filter_Apply_Func
250gl_filter_blend_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd) 249gl_filter_blend_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
251{ 250{
252 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL); 251 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
253 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL); 252 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL);
diff --git a/src/modules/evas/engines/gl_generic/filters/gl_filter_blur.c b/src/modules/evas/engines/gl_generic/filters/gl_filter_blur.c
index a42a246..82a757a 100644
--- a/src/modules/evas/engines/gl_generic/filters/gl_filter_blur.c
+++ b/src/modules/evas/engines/gl_generic/filters/gl_filter_blur.c
@@ -127,7 +127,7 @@ _output_scale_get(Evas_Filter_Context *ctx, Evas_Filter_Command *cmd,
127} 127}
128 128
129static Eina_Bool 129static Eina_Bool
130_gl_filter_blur(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd) 130_gl_filter_blur(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
131{ 131{
132 Evas_Engine_GL_Context *gc; 132 Evas_Engine_GL_Context *gc;
133 Evas_GL_Image *image, *surface; 133 Evas_GL_Image *image, *surface;
@@ -147,8 +147,7 @@ _gl_filter_blur(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
147 d_h = cmd->output->h; 147 d_h = cmd->output->h;
148 EINA_SAFETY_ON_FALSE_RETURN_VAL(s_w && s_h && d_w && d_h, EINA_FALSE); 148 EINA_SAFETY_ON_FALSE_RETURN_VAL(s_w && s_h && d_w && d_h, EINA_FALSE);
149 149
150 re->window_use(re->software.ob); 150 gc = gl_generic_context_find(re, 1);
151 gc = re->window_gl_context_get(re->software.ob);
152 151
153 image = evas_ector_buffer_drawable_image_get(cmd->input->buffer); 152 image = evas_ector_buffer_drawable_image_get(cmd->input->buffer);
154 EINA_SAFETY_ON_NULL_RETURN_VAL(image, EINA_FALSE); 153 EINA_SAFETY_ON_NULL_RETURN_VAL(image, EINA_FALSE);
@@ -267,7 +266,7 @@ _gl_filter_blur(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
267} 266}
268 267
269GL_Filter_Apply_Func 268GL_Filter_Apply_Func
270gl_filter_blur_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd) 269gl_filter_blur_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
271{ 270{
272 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL); 271 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
273 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL); 272 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL);
diff --git a/src/modules/evas/engines/gl_generic/filters/gl_filter_curve.c b/src/modules/evas/engines/gl_generic/filters/gl_filter_curve.c
index 5c7e66d..8042da1 100644
--- a/src/modules/evas/engines/gl_generic/filters/gl_filter_curve.c
+++ b/src/modules/evas/engines/gl_generic/filters/gl_filter_curve.c
@@ -1,7 +1,7 @@
1#include "gl_engine_filter.h" 1#include "gl_engine_filter.h"
2 2
3static Eina_Bool 3static Eina_Bool
4_gl_filter_curve(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd) 4_gl_filter_curve(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
5{ 5{
6 Evas_Engine_GL_Context *gc; 6 Evas_Engine_GL_Context *gc;
7 Evas_GL_Image *image, *surface; 7 Evas_GL_Image *image, *surface;
@@ -26,8 +26,7 @@ _gl_filter_curve(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
26 DBG("curve %d @%p -> %d @%p", cmd->input->id, cmd->input->buffer, 26 DBG("curve %d @%p -> %d @%p", cmd->input->id, cmd->input->buffer,
27 cmd->output->id, cmd->output->buffer); 27 cmd->output->id, cmd->output->buffer);
28 28
29 re->window_use(re->software.ob); 29 gc = gl_generic_context_find(re, 1);
30 gc = re->window_gl_context_get(re->software.ob);
31 evas_gl_common_context_target_surface_set(gc, surface); 30 evas_gl_common_context_target_surface_set(gc, surface);
32 31
33 dc_save = gc->dc; 32 dc_save = gc->dc;
@@ -56,7 +55,7 @@ _gl_filter_curve(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
56} 55}
57 56
58GL_Filter_Apply_Func 57GL_Filter_Apply_Func
59gl_filter_curve_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd) 58gl_filter_curve_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
60{ 59{
61 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL); 60 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
62 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL); 61 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL);
diff --git a/src/modules/evas/engines/gl_generic/filters/gl_filter_displace.c b/src/modules/evas/engines/gl_generic/filters/gl_filter_displace.c
index 89f060d..cf26060 100644
--- a/src/modules/evas/engines/gl_generic/filters/gl_filter_displace.c
+++ b/src/modules/evas/engines/gl_generic/filters/gl_filter_displace.c
@@ -1,7 +1,7 @@
1#include "gl_engine_filter.h" 1#include "gl_engine_filter.h"
2 2
3static Eina_Bool 3static Eina_Bool
4_gl_filter_displace(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd) 4_gl_filter_displace(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
5{ 5{
6 Evas_Engine_GL_Context *gc; 6 Evas_Engine_GL_Context *gc;
7 Evas_GL_Image *image, *surface, *orig_map, *use_map; 7 Evas_GL_Image *image, *surface, *orig_map, *use_map;
@@ -30,8 +30,7 @@ _gl_filter_displace(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
30 DBG("displace %d @%p map %d %p -> %d @%p", cmd->input->id, cmd->input->buffer, 30 DBG("displace %d @%p map %d %p -> %d @%p", cmd->input->id, cmd->input->buffer,
31 cmd->mask->id, cmd->mask->buffer, cmd->output->id, cmd->output->buffer); 31 cmd->mask->id, cmd->mask->buffer, cmd->output->id, cmd->output->buffer);
32 32
33 re->window_use(re->software.ob); 33 gc = gl_generic_context_find(re, 1);
34 gc = re->window_gl_context_get(re->software.ob);
35 evas_gl_common_context_target_surface_set(gc, surface); 34 evas_gl_common_context_target_surface_set(gc, surface);
36 35
37 dc_save = gc->dc; 36 dc_save = gc->dc;
@@ -75,7 +74,7 @@ _gl_filter_displace(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
75} 74}
76 75
77GL_Filter_Apply_Func 76GL_Filter_Apply_Func
78gl_filter_displace_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd) 77gl_filter_displace_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
79{ 78{
80 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL); 79 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
81 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL); 80 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL);
diff --git a/src/modules/evas/engines/gl_generic/filters/gl_filter_fill.c b/src/modules/evas/engines/gl_generic/filters/gl_filter_fill.c
index 0496eb5..d346656 100644
--- a/src/modules/evas/engines/gl_generic/filters/gl_filter_fill.c
+++ b/src/modules/evas/engines/gl_generic/filters/gl_filter_fill.c
@@ -1,7 +1,7 @@
1#include "gl_engine_filter.h" 1#include "gl_engine_filter.h"
2 2
3static Eina_Bool 3static Eina_Bool
4_gl_filter_fill(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd) 4_gl_filter_fill(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
5{ 5{
6 Evas_Filter_Buffer *fb = cmd->output; 6 Evas_Filter_Buffer *fb = cmd->output;
7 Evas_Engine_GL_Context *gc; 7 Evas_Engine_GL_Context *gc;
@@ -39,8 +39,7 @@ _gl_filter_fill(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
39 cmd->draw.R, cmd->draw.G, cmd->draw.B, cmd->draw.A, x, y, w, h, 39 cmd->draw.R, cmd->draw.G, cmd->draw.B, cmd->draw.A, x, y, w, h,
40 fb->id, fb->buffer); 40 fb->id, fb->buffer);
41 41
42 re->window_use(re->software.ob); 42 gc = gl_generic_context_find(re, 1);
43 gc = re->window_gl_context_get(re->software.ob);
44 evas_gl_common_context_target_surface_set(gc, surface); 43 evas_gl_common_context_target_surface_set(gc, surface);
45 44
46 dc_save = gc->dc; 45 dc_save = gc->dc;
@@ -63,7 +62,7 @@ _gl_filter_fill(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
63} 62}
64 63
65GL_Filter_Apply_Func 64GL_Filter_Apply_Func
66gl_filter_fill_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd) 65gl_filter_fill_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
67{ 66{
68 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL); 67 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
69 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL); 68 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, NULL);
diff --git a/src/modules/evas/engines/gl_generic/filters/gl_filter_mask.c b/src/modules/evas/engines/gl_generic/filters/gl_filter_mask.c
index 6c146bf..39e0bc7 100644
--- a/src/modules/evas/engines/gl_generic/filters/gl_filter_mask.c
+++ b/src/modules/evas/engines/gl_generic/filters/gl_filter_mask.c
@@ -1,7 +1,7 @@
1#include "gl_engine_filter.h" 1#include "gl_engine_filter.h"
2 2
3static Eina_Bool 3static Eina_Bool
4_gl_filter_mask(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd) 4_gl_filter_mask(Render_Engine_GL_Generic *re, Evas_Filter_Command *cmd)
5{ 5{
6 Evas_Engine_GL_Context *gc; 6 Evas_Engine_GL_Context *gc;
7 Evas_GL_Image *image, *surface, *orig_mask, *use_mask = NULL; 7 Evas_GL_Image *image, *surface, *orig_mask, *use_mask = NULL;
@@ -25,8 +25,7 @@ _gl_filter_mask(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
25 DBG("mask %d @%p + %d %p -> %d @%p", cmd->input->id, cmd->input->buffer, 25 DBG("mask %d @%p + %d %p -> %d @%p", cmd->input->id, cmd->input->buffer,
26 cmd->mask->id, cmd->mask->buffer, cmd->output->id, cmd->output->buffer); 26 cmd->mask->id, cmd->mask->buffer, cmd->output->id, cmd->output->buffer);
27 27
28 re->window_use(re->software.ob); 28 gc = gl_generic_context_find(re, 1);
29 gc = re->window_gl_context_get(re->software.ob);
30 evas_gl_common_context_target_surface_set(gc, surface); 29 evas_gl_common_context_target_surface_set(gc, surface);
31 30
32 dc_save = gc->dc; 31 dc_save = gc->dc;
@@ -68,7 +67,7 @@ _gl_filter_mask(Render_Output_GL_Generic *re, Evas_Filter_Command *cmd)
68} 67}
69 68
70GL_Filter_Apply_Func 69GL_Filter_Apply_Func
71gl_filter_mask_func_get(Render_Output_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd) 70gl_filter_mask_func_get(Render_Engine_GL_Generic *re EINA_UNUSED, Evas_Filter_Command *cmd)
72{ 71{
73 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL); 72 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
74 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL); 73 EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, NULL);