[cairo] [patch} gl: use GL_FALSE when calling glUniformMatrix

Henry (Yu) Song - SISA henry.song at samsung.com
Thu Sep 5 09:30:32 PDT 2013


Hi, Chris

This patch is for glesv2 backend.  Thanks

Henry
________________________________________
From: Henry (Yu) Song - SISA
Sent: Thursday, August 29, 2013 9:28 AM
To: cairo at cairographics.org
Subject: [patch} gl: use GL_FALSE when calling glUniformMatrix

>From 11bd9a977bf02b49b5690a740ff589d9178a3d12 Mon Sep 17 00:00:00 2001
From: Henry Song <henry.song at samsung.com>
Date: Thu, 29 Aug 2013 09:25:33 -0700
Subject: [PATCH] gl: pass GL_FALSE in glUniformMatrix transpose

Unlike GL and GLESv3, GLESv2 only allows GL_FALSE in transpose parameter
when calling glUniformMatrix
---
 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 cc22cea..9f32954 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
--
1.8.1.2


More information about the cairo mailing list