diff options
author | mh0310.choi <mh0310.choi@samsung.com> | 2015-07-28 10:46:57 +0900 |
---|---|---|
committer | mh0310.choi <mh0310.choi@samsung.com> | 2015-07-28 13:08:12 +0900 |
commit | 5e67a6f721eaedda61300baf0799199c7771ebd0 (patch) | |
tree | 6cd50b52498aab50e79b966cdccc2a137db316d9 /src/cairo-gl-filters.c | |
parent | d3aeffba37161d2b76b29c4ea13369bd67a47a8e (diff) | |
download | cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.tar.gz cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.tar.bz2 cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.zip |
Cairo version Upgrade for Tizen3.0submit/tizen_tv/20150728.091927submit/tizen_mobile/20150728.091912submit/tizen_common/20150728.091859accepted/tizen/tv/20150729.011254accepted/tizen/mobile/20150729.011230
- from 1.12.14 to 1.14.2
Change-Id: I3b62d212041b337bbb926d579f9ce74f42a45c3b
Diffstat (limited to 'src/cairo-gl-filters.c')
-rw-r--r--[-rwxr-xr-x] | src/cairo-gl-filters.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/cairo-gl-filters.c b/src/cairo-gl-filters.c index 7ddc4a246..612e599d5 100755..100644 --- a/src/cairo-gl-filters.c +++ b/src/cairo-gl-filters.c @@ -165,14 +165,12 @@ gaussian_filter_stage_1 (cairo_bool_t x_axis, if (is_opaque) _cairo_gl_shader_bind_float (ctx_out, - _cairo_gl_shader_uniform_for_texunit ( - CAIRO_GL_UNIFORM_ALPHA, CAIRO_GL_TEX_SOURCE), - 1.0); + ctx_out->current_shader->alpha_location[CAIRO_GL_TEX_SOURCE], + 1.0); else _cairo_gl_shader_bind_float (ctx_out, - _cairo_gl_shader_uniform_for_texunit ( - CAIRO_GL_UNIFORM_ALPHA, CAIRO_GL_TEX_SOURCE), - 0.0); + ctx_out->current_shader->alpha_location[CAIRO_GL_TEX_SOURCE], + 0.0); rect.x = 0; rect.y = 0; @@ -212,7 +210,7 @@ gaussian_filter_stage_2 (cairo_bool_t y_axis, col = original_pattern->base.x_radius * 2 + 1; memset (&stage_2_src->operand.texture.coef[0], 0, sizeof (float) * row); - compute_y_coef_to_float (original_pattern->base.convolution_matrix, + compute_y_coef_to_float (original_pattern->base.convolution_matrix, row, col, &stage_2_src->operand.texture.coef[2]); stage_2_src->operand.texture.y_radius = original_pattern->base.y_radius; stage_2_src->operand.texture.x_radius = 1; |