diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-14 13:26:30 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-14 13:26:30 +0000 |
| commit | db2df0aa9b49e006de4fcfc4a0bab32ad0a30173 (patch) | |
| tree | 821bb212591de805a857a77bd55c31ae69d95fa6 /src/gallium/drivers/nv50 | |
| parent | 06f76e4a6b8a3949918e55643f39525de1276815 (diff) | |
nv: Use util_format_name().
Diffstat (limited to 'src/gallium/drivers/nv50')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_state_validate.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_vbo.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c index 0be6abbb17..efab94cab7 100644 --- a/src/gallium/drivers/nv50/nv50_state_validate.c +++ b/src/gallium/drivers/nv50/nv50_state_validate.c @@ -20,6 +20,8 @@ * SOFTWARE. */ +#include "util/u_format.h" + #include "nv50_context.h" #include "nouveau/nouveau_stateobj.h" @@ -79,7 +81,7 @@ nv50_state_validate_fb(struct nv50_context *nv50) NV50_CBUF_FORMAT_CASE(R16G16_UNORM); default: NOUVEAU_ERR("AIIII unknown format %s\n", - pf_name(fb->cbufs[i]->format)); + util_format_name(fb->cbufs[i]->format)); so_data(so, NV50TCL_RT_FORMAT_X8R8G8B8_UNORM); break; } @@ -116,7 +118,7 @@ nv50_state_validate_fb(struct nv50_context *nv50) NV50_ZETA_FORMAT_CASE(Z32_FLOAT); default: NOUVEAU_ERR("AIIII unknown format %s\n", - pf_name(fb->zsbuf->format)); + util_format_name(fb->zsbuf->format)); so_data(so, NV50TCL_ZETA_FORMAT_S8Z24_UNORM); break; } diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c index ca2f8061f3..7a2618d2a3 100644 --- a/src/gallium/drivers/nv50/nv50_vbo.c +++ b/src/gallium/drivers/nv50/nv50_vbo.c @@ -23,7 +23,6 @@ #include "pipe/p_context.h" #include "pipe/p_state.h" #include "util/u_inlines.h" - #include "util/u_format.h" #include "nv50_context.h" @@ -151,7 +150,7 @@ nv50_vbo_vtxelt_to_hw(struct pipe_vertex_element *ve) hw_size = nv50_vbo_size_to_hw(size, ve->nr_components); if (!hw_type || !hw_size) { - NOUVEAU_ERR("unsupported vbo format: %s\n", pf_name(pf)); + NOUVEAU_ERR("unsupported vbo format: %s\n", util_format_name(pf)); abort(); return 0x24e80000; } |