fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-19 10:30:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl: Only use a mat3 for the transformation for gradients coordinates.

Browse source 
No point in passing in a column of zeroes that we multiply by zero, or
the row that we drop on the floor.  We could do even better by just
passing in a 3x2, at the expense of adding a language version
dependency (or just pass in 2 vectors).

No significant performance difference.
This commit is contained in:
Eric Anholt 2010-07-10 14:19:50 -07:00
parent 1e7485f8e5
commit 06ffb7df71
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/cairo-gl-shaders.c
View file

@ -230,14 +230,13 @@ bind_matrix_arb (cairo_gl_shader_t *shader,
cairo_matrix_t* m)
{
GLint location = glGetUniformLocationARB (shader->program, name);
float gl_m[16] = {
m->xx, m->xy, 0, m->x0,
m->yx, m->yy, 0, m->y0,
0, 0, 1, 0,
0, 0, 0, 1
float gl_m[9] = {
m->xx, m->xy, m->x0,
m->yx, m->yy, m->y0,
0, 0, 1
};
assert (location != -1);
glUniformMatrix4fvARB (location, 1, GL_TRUE, gl_m);
glUniformMatrix3fvARB (location, 1, GL_TRUE, gl_m);
}
static void
@ -387,13 +386,12 @@ bind_matrix_core_2_0 (cairo_gl_shader_t *shader, const char *name, cairo_matrix_
{
GLint location = glGetUniformLocation (shader->program, name);
float gl_m[16] = {
m->xx, m->xy, 0, m->x0,
m->yx, m->yy, 0, m->y0,
0, 0, 1, 0,
0, 0, 0, 1
m->xx, m->xy, m->x0,
m->yx, m->yy, m->y0,
0, 0, 1
};
assert (location != -1);
glUniformMatrix4fv (location, 1, GL_TRUE, gl_m);
glUniformMatrix3fv (location, 1, GL_TRUE, gl_m);
}
static void
@ -703,12 +701,12 @@ cairo_gl_shader_emit_color (cairo_output_stream_t *stream,
case CAIRO_GL_OPERAND_LINEAR_GRADIENT:
_cairo_output_stream_printf (stream,
"uniform sampler1D %s_sampler;\n"
"uniform mat4 %s_matrix;\n"
"uniform mat3 %s_matrix;\n"
"uniform vec2 %s_segment;\n"
"\n"
"vec4 get_%s()\n"
"{\n"
" vec2 pos = (%s_matrix * vec4 (gl_FragCoord.xy, 0.0, 1.0)).xy;\n"
" vec2 pos = (%s_matrix * vec3 (gl_FragCoord.xy, 1.0)).xy;\n"
" float t = dot (pos, %s_segment) / dot (%s_segment, %s_segment);\n"
" return texture1D (%s_sampler, t);\n"
"}\n",
@ -718,14 +716,14 @@ cairo_gl_shader_emit_color (cairo_output_stream_t *stream,
case CAIRO_GL_OPERAND_RADIAL_GRADIENT:
_cairo_output_stream_printf (stream,
"uniform sampler1D %s_sampler;\n"
"uniform mat4 %s_matrix;\n"
"uniform mat3 %s_matrix;\n"
"uniform vec2 %s_circle_1;\n"
"uniform float %s_radius_0;\n"
"uniform float %s_radius_1;\n"
"\n"
"vec4 get_%s()\n"
"{\n"
" vec2 pos = (%s_matrix * vec4 (gl_FragCoord.xy, 0.0, 1.0)).xy;\n"
" vec2 pos = (%s_matrix * vec3 (gl_FragCoord.xy, 1.0)).xy;\n"
" \n"
" float dr = %s_radius_1 - %s_radius_0;\n"
" float dot_circle_1 = dot (%s_circle_1, %s_circle_1);\n"