summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-04-10 15:23:54 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-04-10 15:23:54 +0100
commit0b12f1d8e4d0a4fafac9553f144535efc4ebe0be (patch)
treefe7bfcb8dff4a7276ab2f387bf3eec448233c734
parent755a7107aed268d87c5cc0feb1ba388b0cb7fc59 (diff)
sna: Fix shadowed variable
sna_accel.c: In function 'sna_pixmap_move_area_to_gpu': sna_accel.c:1751:12: warning: declaration of 'flags' shadows a parameter [-Wshadow] sna_accel.c:1731:72: warning: shadowed declaration is here [-Wshadow] Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_accel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index b6adc606..590cc11b 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1748,20 +1748,20 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, BoxPtr box, unsigned int flags)
}
if (priv->gpu_bo == NULL) {
- unsigned flags;
+ unsigned create;
- flags = 0;
+ create = 0;
if (priv->cpu_damage)
- flags |= CREATE_INACTIVE;
+ create |= CREATE_INACTIVE;
if (pixmap->usage_hint == SNA_CREATE_FB)
- flags |= CREATE_EXACT | CREATE_SCANOUT;
+ create |= CREATE_EXACT | CREATE_SCANOUT;
priv->gpu_bo = kgem_create_2d(&sna->kgem,
pixmap->drawable.width,
pixmap->drawable.height,
pixmap->drawable.bitsPerPixel,
sna_pixmap_choose_tiling(pixmap),
- flags);
+ create);
if (priv->gpu_bo == NULL)
return false;