diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-11-24 22:23:37 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2011-11-25 16:38:44 +0100 |
| commit | dbf00812b073bd3f17cbbaadb14c6f603b83cd10 (patch) | |
| tree | b599c35e4476ae54890841721a6b6e6ee775e012 /src/gallium | |
| parent | 32b1641a59610d94c0b56bf0494b2fc1cf400e3e (diff) | |
st/xa: Kill a couple of compilation warnings
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_composite.c | 2 | ||||
| -rw-r--r-- | 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 f66eebdeb0..0659c77be5 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 ea2b923a5a..d9bb86c828 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); |