st/xa: Really support xa_surface_format. Bump minor.

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

diff --git a/src/gallium/state_trackers/xa/Makefile b/src/gallium/state_trackers/xa/Makefile
index def371b7b84caedd4b048bc3eeb822e06634ddb9..7dc47b59ccc36628674500a24da18593203b1d91 100644 (file)
--- 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 28e2cb0c766a031d9816f56f89309bcb23f5d9b6..62ae333eeb5494f9e0d0664168f0594188df7933 100644 (file)
--- 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 12ee29c4647df969804cf9f0b8fcacc67c465672..8d58e5a6f139115f37ca5bf421d42d2a50cd40e0 100644 (file)
--- 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 3090de6fbbb63f25b1ec0d70988da95844442c05..ed81070a4038dbd0d97b70f6f6d85b6c7c59fc45 100644 (file)
--- 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 9496b22b51c111c1ac1ce4ffe691f6d0beaa9ac9..7d46627db4495edcb666bb79ece5125fecd53f30 100644 (file)
--- 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