Re: [PATCH] Manually transpose the matrix in _cairo_gl_shader_bind_matrix()
"Henry (Yu) Song" <[email protected]>
| Newsgroups | gmane.comp.lib.cairo |
|---|---|
| Message-ID | <3955FA337689574EB32F94B12A7E6E9E6C20ECD2@sisaex01sj> |
That is right. It is also fixed in our fork https://github.com/SRA-SiliconValley/cairogles.git, checkout evasgl branch. ________________________________________ From: cairo [[email protected]] on behalf of Zan Dobersek [[email protected]] Sent: Friday, May 08, 2015 1:50 AM To: [email protected] Subject: [cairo] [PATCH] Manually transpose the matrix in _cairo_gl_shader_bind_matrix() From: Zan Dobersek <[email protected]> To maintain compatibility with OpenGL ES 2.0, the matrix in _cairo_gl_shader_bind_matrix() should be manually transposed, and GL_FALSE passed as the transpose argument to the glUniformMatrix3fv() call as it is the only valid value for that parameter in OpenGL ES 2.0. --- src/cairo-gl-shaders.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c index 2710606..fe975d2 100644 --- a/src/cairo-gl-shaders.c +++ b/src/cairo-gl-shaders.c @@ -973,12 +973,12 @@ _cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx, { cairo_gl_dispatch_t *dispatch = &ctx->dispatch; float gl_m[9] = { - m->xx, m->xy, m->x0, - m->yx, m->yy, m->y0, - 0, 0, 1 + m->xx, m->yx, 0, + m->xy, m->yy, 0, + m->x0, m->y0, 1 }; assert (location != -1); - dispatch->UniformMatrix3fv (location, 1, GL_TRUE, gl_m); + dispatch->UniformMatrix3fv (location, 1, GL_FALSE, gl_m); } void -- 2.1.4 -- cairo mailing list [email protected] http://lists.cairographics.org/mailman/listinfo/cairo -- cairo mailing list [email protected] http://lists.cairographics.org/mailman/listinfo/cairo