diff options
| author | Eric Anholt <eric@anholt.net> | 2010-02-03 15:25:47 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-02-04 07:05:41 -0800 |
| commit | b2d8c9cbf2faec570450d163da140c54e64bbdc8 (patch) | |
| tree | 10c824b27399193c16571b639e2eb25e410e5d98 | |
| parent | 0fceac4d52d4b574b9c1f911b83d15dc7e01691d (diff) | |
[gl] Use the shader source choice from operand setup instead of DIY.
| -rw-r--r-- | src/cairo-gl-glyphs.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c index bf05f8d6..69485fa7 100644 --- a/src/cairo-gl-glyphs.c +++ b/src/cairo-gl-glyphs.c @@ -244,7 +244,6 @@ typedef struct _cairo_gl_glyphs_setup cairo_gl_surface_t *dst; cairo_operator_t op; cairo_bool_t component_alpha; - cairo_gl_shader_source_t source; cairo_gl_shader_in_t in; } cairo_gl_glyphs_setup_t; @@ -303,7 +302,7 @@ _cairo_gl_glyphs_set_shader (cairo_gl_context_t *ctx, cairo_status_t status; status = _cairo_gl_get_program (ctx, - setup->source, + setup->composite->src.source, CAIRO_GL_SHADER_MASK_TEXTURE, in, &setup->composite->shader); @@ -506,18 +505,6 @@ _render_glyphs (cairo_gl_surface_t *dst, setup.op = op; setup.in = CAIRO_GL_SHADER_IN_COUNT; /* unset */ - if (setup.composite->src.type == OPERAND_CONSTANT) { - setup.source = CAIRO_GL_SHADER_SOURCE_CONSTANT; - } else { - if (setup.composite->src.operand.texture.surface->base.content != - CAIRO_CONTENT_ALPHA) - { - setup.source = CAIRO_GL_SHADER_SOURCE_TEXTURE; - } else { - setup.source = CAIRO_GL_SHADER_SOURCE_TEXTURE_ALPHA; - } - } - glGenBuffersARB (1, &vbo); glBindBufferARB (GL_ARRAY_BUFFER_ARB, vbo); |