Mesa (xa_branch): st/xa: Really support xa_surface_format. Bump minor.

[Thomas Hellstrom]

Module: Mesa
Branch: xa_branch
Commit: 5f20fae40d3034de4dc8fdb3678000f7b17c6d75
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f20fae40d3034de4dc8fdb3678000f7b17c6d75

Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Tue Jun 21 00:10:16 2011 +0200

st/xa: Really support xa_surface_format. Bump minor.

Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>

---

 src/gallium/state_trackers/xa/Makefile     |    2 +-
 src/gallium/state_trackers/xa/xa_symbols   |    1 +
 src/gallium/state_trackers/xa/xa_tracker.c |    6 ++++++
 src/gallium/state_trackers/xa/xa_tracker.h |    4 ++--
 src/gallium/targets/xa-vmwgfx/Makefile     |    2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/gallium/state_trackers/xa/Makefile b/src/gallium/state_trackers/xa/Makefile
index def371b..7dc47b5 100644
--- a/src/gallium/state_trackers/xa/Makefile
+++ b/src/gallium/state_trackers/xa/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
 ##### MACROS #####
 
 XA_MAJOR = 0
-XA_MINOR = 1
+XA_MINOR = 2
 XA_TINY = 0
 XA_CFLAGS = -g -fPIC -Wall
 
diff --git a/src/gallium/state_trackers/xa/xa_symbols b/src/gallium/state_trackers/xa/xa_symbols
index 28e2cb0..62ae333 100644
--- a/src/gallium/state_trackers/xa/xa_symbols
+++ b/src/gallium/state_trackers/xa/xa_symbols
@@ -7,6 +7,7 @@ xa_surface_redefine
 xa_surface_dma
 xa_surface_map
 xa_surface_unmap
+xa_surface_format
 xa_copy_prepare
 xa_copy
 xa_copy_done
diff --git a/src/gallium/state_trackers/xa/xa_tracker.c b/src/gallium/state_trackers/xa/xa_tracker.c
index 12ee29c..8d58e5a 100644
--- a/src/gallium/state_trackers/xa/xa_tracker.c
+++ b/src/gallium/state_trackers/xa/xa_tracker.c
@@ -418,3 +418,9 @@ xa_surface_handle(struct xa_surface *srf,
 
     return XA_ERR_NONE;
 }
+
+enum xa_formats
+xa_surface_format(const struct xa_surface *srf)
+{
+    return srf->fdesc.format;
+}
diff --git a/src/gallium/state_trackers/xa/xa_tracker.h b/src/gallium/state_trackers/xa/xa_tracker.h
index 3090de6..ed81070 100644
--- a/src/gallium/state_trackers/xa/xa_tracker.h
+++ b/src/gallium/state_trackers/xa/xa_tracker.h
@@ -37,7 +37,7 @@
 #include <stdint.h>
 
 #define XA_TRACKER_VERSION_MAJOR 0
-#define XA_TRACKER_VERSION_MINOR 1
+#define XA_TRACKER_VERSION_MINOR 2
 #define XA_TRACKER_VERSION_PATCH 0
 
 #define XA_FLAG_SHARED         (1 << 0)
@@ -155,7 +155,7 @@ extern struct xa_surface *xa_surface_create(struct xa_tracker *xa,
 					    enum xa_formats pform,
 					    unsigned int flags);
 
-enum xa_formats xa_surface_pict_format(const struct xa_surface *srf);
+enum xa_formats xa_surface_format(const struct xa_surface *srf);
 
 extern void xa_surface_destroy(struct xa_surface *srf);
 
diff --git a/src/gallium/targets/xa-vmwgfx/Makefile b/src/gallium/targets/xa-vmwgfx/Makefile
index 9496b22..7d46627 100644
--- a/src/gallium/targets/xa-vmwgfx/Makefile
+++ b/src/gallium/targets/xa-vmwgfx/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
 ##### MACROS #####
 
 XA_MAJOR = 0
-XA_MINOR = 1
+XA_MINOR = 2
 XA_TINY = 0
 XA_CFLAGS = -g -fPIC