summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-06-06 17:04:01 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-06-06 17:04:01 +0100
commitc553dcae2dd714cac413ffc7c7779cd78c9a3e61 (patch)
tree41380d6e3d17adf5f1c29432150fa4ca1d259310
parent536033b4edb40db18210e5272eb8ce9703e5e364 (diff)
sna: Silence a few unused function warnings
Reported-by: Zdenek Kabelac <zkabelac@redhat.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_dri.c26
-rw-r--r--src/sna/sna_tiling.c6
-rw-r--r--src/sna/sna_trapezoids.c8
3 files changed, 13 insertions, 27 deletions
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 000738bc..da49e12b 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -900,19 +900,6 @@ sna_dri_frame_event_info_free(struct sna_dri_frame_event *info)
free(info);
}
-static void
-sna_dri_exchange_attachment(DRI2BufferPtr front, DRI2BufferPtr back)
-{
- int tmp;
-
- DBG(("%s(%d <--> %d)\n",
- __FUNCTION__, front->attachment, back->attachment));
-
- tmp = front->attachment;
- front->attachment = back->attachment;
- back->attachment = tmp;
-}
-
/*
* Our internal swap routine takes care of actually exchanging, blitting, or
* flipping buffers as necessary.
@@ -1714,6 +1701,19 @@ blit_fallback:
}
#if DRI2INFOREC_VERSION >= 7
+static void
+sna_dri_exchange_attachment(DRI2BufferPtr front, DRI2BufferPtr back)
+{
+ int tmp;
+
+ DBG(("%s(%d <--> %d)\n",
+ __FUNCTION__, front->attachment, back->attachment));
+
+ tmp = front->attachment;
+ front->attachment = back->attachment;
+ back->attachment = tmp;
+}
+
static Bool
sna_dri_async_swap(ClientPtr client, DrawablePtr draw,
DRI2BufferPtr front, DRI2BufferPtr back,
diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index d7e6d400..33fee42e 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -265,12 +265,6 @@ done:
free(tile);
}
-static inline int split(int x, int y)
-{
- int n = x / y + 1;
- return (x + n - 1) / n;
-}
-
Bool
sna_tiling_composite(uint32_t op,
PicturePtr src,
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index bfb4e0c9..780a0fa7 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -1540,14 +1540,6 @@ inplace_row(struct active_list *active, uint8_t *row, int width)
}
}
-static inline uint8_t clip255(int x)
-{
- if (x > 255)
- return 255;
-
- return x;
-}
-
inline static void
inplace_subrow(struct active_list *active, int8_t *row,
int width, int *min, int *max)