st/xa: Kill a couple of compilation warnings

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

diff --git a/src/gallium/state_trackers/xa/xa_composite.c b/src/gallium/state_trackers/xa/xa_composite.c
index f66eebdeb01621c579194b8bdc82ebb596f7566c..0659c77be53ec7445c279e3b31e1c083d6a9c2f0 100644 (file)
--- 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 ea2b923a5a11d73ca7e4b5ba9dbd891ab7c95826..d9bb86c828ae6e7fac61a62e00f1a51793ed5b6e 100644 (file)
--- 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);