diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-08 15:30:10 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-08 15:30:10 +0100 |
| commit | 6fd8b9b550713302566bb4c28e49c219870ccfec (patch) | |
| tree | 1a7a61a639c0b5722bacc24627f71affab68c57a /src/gallium/drivers/nv50/nv50_tex.c | |
| parent | 72befaaae5fd9555e1f6ccbd6a74c0d640fc2929 (diff) | |
Remove remaining pipe format utility functions.
Depricate pf_type(), pf_size_*(), pf_layout() and pf_exp2().
Map depricated PIPE_FORMAT_TYPE to new UTIL_FORMAT_ values:
UNKNOWN = TYPE_VOID
UNORM = TYPE_UNSIGNED + LAYOUT_ARITH
SNORM = TYPE_SIGNED + LAYOUT_ARITH
FIXED = TYPE_FIXED
FLOAT = TYPE_FLOAT
USCALED = TYPE_UNSIGNED + LAYOUT_ARRAY
SSCALED = TYPE_SIGNED + LAYOUT_ARRAY
SRGB = TYPE_COLORSPACE_SRGB
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_tex.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_tex.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c index 417d367942..55a601deb8 100644 --- a/src/gallium/drivers/nv50/nv50_tex.c +++ b/src/gallium/drivers/nv50/nv50_tex.c @@ -25,6 +25,8 @@ #include "nouveau/nouveau_stateobj.h" +#include "util/u_format.h" + #define _MIXED(pf, t0, t1, t2, t3, cr, cg, cb, ca, f) \ { \ PIPE_FORMAT_##pf, \ @@ -89,6 +91,7 @@ nv50_tex_construct(struct nv50_context *nv50, struct nouveau_stateobj *so, { unsigned i; uint32_t mode; + const struct util_format_description *desc; for (i = 0; i < NV50_TEX_FORMAT_LIST_SIZE; i++) if (nv50_tex_format_list[i].pf == mt->base.base.format) @@ -106,7 +109,10 @@ nv50_tex_construct(struct nv50_context *nv50, struct nouveau_stateobj *so, mode |= ((mt->base.bo->tile_mode & 0x0f) << 22) | ((mt->base.bo->tile_mode & 0xf0) << 21); - if (pf_type(mt->base.base.format) == PIPE_FORMAT_TYPE_SRGB) + desc = util_format_description(mt->base.base.format); + assert(desc); + + if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) mode |= 0x0400; switch (mt->base.base.target) { |