summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cairo-gl-shaders.c4
-rw-r--r--src/cairo-gl-surface.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c
index 590eb95f..632b336c 100644
--- a/src/cairo-gl-shaders.c
+++ b/src/cairo-gl-shaders.c
@@ -467,7 +467,6 @@ create_shader_program (cairo_gl_shader_program_t *program,
if (impl == NULL)
return CAIRO_INT_STATUS_UNSUPPORTED;
- printf ("=== compiling ===\n\n%s\n\n%s\n\n", vertex_text, fragment_text);
status = impl->compile_shader (&program->vertex_shader,
GL_VERTEX_SHADER,
vertex_text);
@@ -1140,8 +1139,7 @@ _cairo_gl_get_draw_shader (cairo_gl_context_t *ctx,
char name[20];
sprintf (name, "texture%u", i);
status = bind_texture_to_shader (entry->program.program, name, i);
- if (status != CAIRO_STATUS_SUCCESS)
- printf ("failed binding %s\n", name);
+ assert (status == CAIRO_STATUS_SUCCESS);
}
_cairo_gl_use_program (NULL);
status = _cairo_cache_insert (&ctx->shader_cache, &entry->base);
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 25d46ad9..3a5b52a3 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -838,8 +838,8 @@ _cairo_gl_surface_draw_image (cairo_gl_surface_t *dst,
&format,
&type,
&has_alpha) ||
- (requires_shader && (! ((cairo_gl_context_t *) dst->base.device)->using_glsl) ||
- src_x != 0 || src_y != 0))
+ (requires_shader && (! ((cairo_gl_context_t *) dst->base.device)->using_glsl ||
+ src_x != 0 || src_y != 0)))
{
cairo_bool_t is_supported;