[PATCH 4/7] glamor: Remove destination drawable argument from glamor_set_texture

Keith Packard keithp at keithp.com
Mon May 11 21:23:55 PDT 2015


This argument wasn't used at all.

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 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 3036a06..e94bca8 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 36b789a..1d8eed4 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,
-- 
2.1.4



More information about the xorg-devel mailing list