Mesa (master): st/xa: Kill a couple of compilation warnings

[Thomas Hellstrom]

Module: Mesa
Branch: master
Commit: dbf00812b073bd3f17cbbaadb14c6f603b83cd10
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dbf00812b073bd3f17cbbaadb14c6f603b83cd10

Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Thu Nov 24 22:23:37 2011 +0100

st/xa: Kill a couple of compilation warnings

Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob at vmware.com>

---

 src/gallium/state_trackers/xa/xa_composite.c |    2 +-
 src/gallium/state_trackers/xa/xa_context.h   |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/xa/xa_composite.c b/src/gallium/state_trackers/xa/xa_composite.c
index f66eebd..0659c77 100644
--- a/src/gallium/state_trackers/xa/xa_composite.c
+++ b/src/gallium/state_trackers/xa/xa_composite.c
@@ -39,7 +39,7 @@
 #define XFixedToDouble(f)    (((double) (f)) / 65536.)
 
 struct xa_composite_blend {
-    enum xa_composite_op op : 8;
+    unsigned op : 8;
 
     unsigned alpha_dst : 4;
     unsigned alpha_src : 4;
diff --git a/src/gallium/state_trackers/xa/xa_context.h b/src/gallium/state_trackers/xa/xa_context.h
index ea2b923..d9bb86c 100644
--- a/src/gallium/state_trackers/xa/xa_context.h
+++ b/src/gallium/state_trackers/xa/xa_context.h
@@ -69,6 +69,11 @@ extern int xa_surface_dma(struct xa_context *ctx,
 			  int to_surface, struct xa_box *boxes,
 			  unsigned int num_boxes);
 
+extern void *xa_surface_map(struct xa_context *ctx,
+			    struct xa_surface *srf, unsigned int usage);
+
+extern void xa_surface_unmap(struct xa_surface *srf);
+
 extern int
 xa_solid_prepare(struct xa_context *ctx, struct xa_surface *dst,
 		 uint32_t fg);