From dcb3d74ba8861e7b0a592e92b5b2247b84e843f3 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 13 Oct 2014 12:35:40 -0700 Subject: glamor: Remove destination drawable argument from glamor_set_texture This argument wasn't used at all. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt --- glamor/glamor_transform.c | 9 +++------ glamor/glamor_transform.h | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/glamor/glamor_transform.c b/glamor/glamor_transform.c index 3036a06d0..e94bca856 100644 --- a/glamor/glamor_transform.c +++ b/glamor/glamor_transform.c @@ -155,8 +155,7 @@ glamor_set_solid(PixmapPtr pixmap, } Bool -glamor_set_texture(PixmapPtr pixmap, - PixmapPtr texture, +glamor_set_texture(PixmapPtr texture, int off_x, int off_y, GLint offset_uniform, @@ -192,8 +191,7 @@ glamor_set_tiled(PixmapPtr pixmap, if (!glamor_set_planemask(gc->depth, gc->planemask)) return FALSE; - return glamor_set_texture(pixmap, - gc->tile.pixmap, + return glamor_set_texture(gc->tile.pixmap, -gc->patOrg.x, -gc->patOrg.y, offset_uniform, @@ -274,8 +272,7 @@ glamor_set_stippled(PixmapPtr pixmap, if (!glamor_set_solid(pixmap, gc, TRUE, fg_uniform)) return FALSE; - return glamor_set_texture(pixmap, - stipple, + return glamor_set_texture(stipple, -gc->patOrg.x, -gc->patOrg.y, offset_uniform, diff --git a/glamor/glamor_transform.h b/glamor/glamor_transform.h index 36b789af8..1d8eed477 100644 --- a/glamor/glamor_transform.h +++ b/glamor/glamor_transform.h @@ -39,8 +39,7 @@ glamor_set_color(PixmapPtr pixmap, GLint uniform); Bool -glamor_set_texture(PixmapPtr pixmap, - PixmapPtr texture, +glamor_set_texture(PixmapPtr texture, int off_x, int off_y, GLint offset_uniform, -- cgit v1.2.3