diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-17 23:41:57 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-17 23:41:57 +0100 |
| commit | b1ed72ebe2599ec178f51d86fd42f26486b9a19b (patch) | |
| tree | b49428bb48d81bf1396ef14ee8a0a462f89d2d8e /src/gallium/drivers/nv30 | |
| parent | ec5577a83da18890a4f334af2241aca41b6ed31b (diff) | |
| download | external_mesa3d-b1ed72ebe2599ec178f51d86fd42f26486b9a19b.zip external_mesa3d-b1ed72ebe2599ec178f51d86fd42f26486b9a19b.tar.gz external_mesa3d-b1ed72ebe2599ec178f51d86fd42f26486b9a19b.tar.bz2 | |
Move the remaining format pf_get_* functions to u_format.h.
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
Diffstat (limited to 'src/gallium/drivers/nv30')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_miptree.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_transfer.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c index 920fe64..ce95d97 100644 --- a/src/gallium/drivers/nv30/nv30_miptree.c +++ b/src/gallium/drivers/nv30/nv30_miptree.c @@ -1,6 +1,7 @@ #include "pipe/p_state.h" #include "pipe/p_defines.h" #include "pipe/p_inlines.h" +#include "util/u_format.h" #include "util/u_math.h" #include "nv30_context.h" @@ -29,9 +30,9 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt) for (l = 0; l <= pt->last_level; l++) { if (wide_pitch && (pt->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR)) - nv30mt->level[l].pitch = align(pf_get_stride(pt->format, pt->width0), 64); + nv30mt->level[l].pitch = align(util_format_get_stride(pt->format, pt->width0), 64); else - nv30mt->level[l].pitch = pf_get_stride(pt->format, width); + nv30mt->level[l].pitch = util_format_get_stride(pt->format, width); nv30mt->level[l].image_offset = CALLOC(nr_faces, sizeof(unsigned)); diff --git a/src/gallium/drivers/nv30/nv30_transfer.c b/src/gallium/drivers/nv30/nv30_transfer.c index e29bfbd..2255a02 100644 --- a/src/gallium/drivers/nv30/nv30_transfer.c +++ b/src/gallium/drivers/nv30/nv30_transfer.c @@ -1,6 +1,7 @@ #include <pipe/p_state.h> #include <pipe/p_defines.h> #include <pipe/p_inlines.h> +#include <util/u_format.h> #include <util/u_memory.h> #include <util/u_math.h> #include <nouveau/nouveau_winsys.h> @@ -151,7 +152,7 @@ nv30_transfer_map(struct pipe_screen *pscreen, struct pipe_transfer *ptx) pipe_transfer_buffer_flags(ptx)); return map + ns->base.offset + - ptx->y * ns->pitch + ptx->x * pf_get_blocksize(ptx->texture->format); + ptx->y * ns->pitch + ptx->x * util_format_get_blocksize(ptx->texture->format); } static void |