[cairo-commit] 2 commits - src/cairo-gl-composite.c src/cairo-gl-operand.c src/cairo-gl-private.h src/cairo-xcb-surface-render.c

[Chris Wilson]

 src/cairo-gl-composite.c       |    6 +++---
 src/cairo-gl-operand.c         |    3 +--
 src/cairo-gl-private.h         |    3 +--
 src/cairo-xcb-surface-render.c |    2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit c8bfa8c0888b16747c5e07ca4b844d5feabd8756
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 11 12:44:25 2011 +0100

    xcb: Re-enable glyph rendering
    
    I lost the '&& 0' I put in to disable the glyph rendering until I had
    the glyph cache integration working again.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
index 00bbaa1..033aef9 100644
--- a/src/cairo-xcb-surface-render.c
+++ b/src/cairo-xcb-surface-render.c
@@ -4727,7 +4727,7 @@ _cairo_xcb_surface_render_glyphs (cairo_xcb_surface_t	*surface,
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     status = CAIRO_INT_STATUS_UNSUPPORTED;
-    if (surface->connection->flags & CAIRO_XCB_RENDER_HAS_COMPOSITE_GLYPHS && 0) {
+    if (surface->connection->flags & CAIRO_XCB_RENDER_HAS_COMPOSITE_GLYPHS) {
 	_cairo_scaled_font_freeze_cache (scaled_font);
 
 	status = _can_composite_glyphs (surface, &composite->bounded,
commit a09f70586df52d9d3156d64de5fbc6a2b92a1cce
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 11 12:01:31 2011 +0100

    gl: Remove unused alpha argument from operand_emit
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-gl-composite.c b/src/cairo-gl-composite.c
index 382b13b..5bce04d 100644
--- a/src/cairo-gl-composite.c
+++ b/src/cairo-gl-composite.c
@@ -656,8 +656,8 @@ _cairo_gl_composite_emit_vertex (cairo_gl_context_t *ctx,
     *vb++ = x;
     *vb++ = y;
 
-    _cairo_gl_operand_emit (&ctx->operands[CAIRO_GL_TEX_SOURCE], &vb, x, y, alpha);
-    _cairo_gl_operand_emit (&ctx->operands[CAIRO_GL_TEX_MASK  ], &vb, x, y, alpha);
+    _cairo_gl_operand_emit (&ctx->operands[CAIRO_GL_TEX_SOURCE], &vb, x, y);
+    _cairo_gl_operand_emit (&ctx->operands[CAIRO_GL_TEX_MASK  ], &vb, x, y);
 
     if (ctx->spans) {
 	union fi {
@@ -706,7 +706,7 @@ _cairo_gl_composite_emit_glyph_vertex (cairo_gl_context_t *ctx,
     *vb++ = x;
     *vb++ = y;
 
-    _cairo_gl_operand_emit (&ctx->operands[CAIRO_GL_TEX_SOURCE], &vb, x, y, 0);
+    _cairo_gl_operand_emit (&ctx->operands[CAIRO_GL_TEX_SOURCE], &vb, x, y);
 
     *vb++ = glyph_x;
     *vb++ = glyph_y;
diff --git a/src/cairo-gl-operand.c b/src/cairo-gl-operand.c
index f0f7656..a7e187e 100644
--- a/src/cairo-gl-operand.c
+++ b/src/cairo-gl-operand.c
@@ -600,8 +600,7 @@ void
 _cairo_gl_operand_emit (cairo_gl_operand_t *operand,
                         GLfloat ** vb,
                         GLfloat x,
-                        GLfloat y,
-                        uint8_t alpha)
+                        GLfloat y)
 {
     switch (operand->type) {
     default:
diff --git a/src/cairo-gl-private.h b/src/cairo-gl-private.h
index 6d8aab8..9027178 100644
--- a/src/cairo-gl-private.h
+++ b/src/cairo-gl-private.h
@@ -636,8 +636,7 @@ cairo_private void
 _cairo_gl_operand_emit (cairo_gl_operand_t *operand,
                         GLfloat ** vb,
                         GLfloat x,
-                        GLfloat y,
-                        uint8_t alpha);
+                        GLfloat y);
 
 cairo_private void
 _cairo_gl_operand_copy (cairo_gl_operand_t *dst,