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/nv40 | |
| parent | 06f76e4a6b8a3949918e55643f39525de1276815 (diff) | |
nv: Use util_format_name().
Diffstat (limited to 'src/gallium/drivers/nv40')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_fragtex.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_vbo.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv40/nv40_fragtex.c b/src/gallium/drivers/nv40/nv40_fragtex.c index aad9198210..7a28d577b1 100644 --- a/src/gallium/drivers/nv40/nv40_fragtex.c +++ b/src/gallium/drivers/nv40/nv40_fragtex.c @@ -1,3 +1,5 @@ +#include "util/u_format.h" + #include "nv40_context.h" #define _(m,tf,ts0x,ts0y,ts0z,ts0w,ts1x,ts1y,ts1z,ts1w,sx,sy,sz,sw) \ @@ -53,7 +55,7 @@ nv40_fragtex_format(uint pipe_format) tf++; } - NOUVEAU_ERR("unknown texture format %s\n", pf_name(pipe_format)); + NOUVEAU_ERR("unknown texture format %s\n", util_format_name(pipe_format)); return NULL; } diff --git a/src/gallium/drivers/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c index f2048eb869..7812460d2e 100644 --- a/src/gallium/drivers/nv40/nv40_vbo.c +++ b/src/gallium/drivers/nv40/nv40_vbo.c @@ -1,6 +1,7 @@ #include "pipe/p_context.h" #include "pipe/p_state.h" #include "util/u_inlines.h" +#include "util/u_format.h" #include "nv40_context.h" #include "nv40_state.h" @@ -34,7 +35,7 @@ nv40_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp) *fmt = NV40TCL_VTXFMT_TYPE_USHORT; break; default: - NOUVEAU_ERR("Unknown format %s\n", pf_name(pipe)); + NOUVEAU_ERR("Unknown format %s\n", util_format_name(pipe)); return 1; } @@ -60,7 +61,7 @@ nv40_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp) *ncomp = 4; break; default: - NOUVEAU_ERR("Unknown format %s\n", pf_name(pipe)); + NOUVEAU_ERR("Unknown format %s\n", util_format_name(pipe)); return 1; } |