diff options
| author | Thomas Hellstrom <[email protected]> | 2011-06-21 00:10:16 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <[email protected]> | 2011-06-21 00:11:20 +0200 |
| commit | 5f20fae40d3034de4dc8fdb3678000f7b17c6d75 (patch) | |
| tree | e7375cedd802b697ae7b9414fcedf23de9ca7608 | |
| parent | 642951fbcaa56a975422f7caddf6620f20d47721 (diff) | |
st/xa: Really support xa_surface_format. Bump minor.
Signed-off-by: Thomas Hellstrom <[email protected]>
| -rw-r--r-- | src/gallium/state_trackers/xa/Makefile | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_symbols | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_tracker.c | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_tracker.h | 4 | ||||
| -rw-r--r-- | 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 def371b7b84..7dc47b59ccc 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 28e2cb0c766..62ae333eeb5 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 12ee29c4647..8d58e5a6f13 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 3090de6fbbb..ed81070a403 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 9496b22b51c..7d46627db44 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 |