fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 15:10:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nouveau: pf_sprint_name -> pf_name

Browse source
This commit is contained in:
Ben Skeggs 2008-08-11 16:14:42 +10:00
parent f56eda6a85
commit df4228dedd
7 changed files with 13 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/nv04/nv04_fragtex.c
View file

@ -51,7 +51,6 @@ static uint32_t
nv04_fragtex_format(uint pipe_format)
{
struct nv04_texture_format *tf = nv04_texture_formats;
char fs[128];
int i;
for (i=0; i< sizeof(nv04_texture_formats)/sizeof(nv04_texture_formats[0]); i++) {
@ -60,8 +59,7 @@ nv04_fragtex_format(uint pipe_format)
tf++;
}
pf_sprint_name(fs, pipe_format);
NOUVEAU_ERR("unknown texture format %s\n", fs);
NOUVEAU_ERR("unknown texture format %s\n", pf_name(pipe_format));
return 0;
}

3
src/gallium/drivers/nv30/nv30_fragtex.c
View file

@ -75,8 +75,7 @@ nv30_fragtex_format(uint pipe_format)
tf++;
}
pf_sprint_name(fs, pipe_format);
NOUVEAU_ERR("unknown texture format %s\n", fs);
NOUVEAU_ERR("unknown texture format %s\n", pf_name(pipe_format));
return NULL;
}

8
src/gallium/drivers/nv30/nv30_vbo.c
View file

@ -14,8 +14,6 @@
static INLINE int
nv30_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
{
char fs[128];
switch (pipe) {
case PIPE_FORMAT_R32_FLOAT:
case PIPE_FORMAT_R32G32_FLOAT:
@ -36,8 +34,7 @@ nv30_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
*fmt = NV34TCL_VTXFMT_TYPE_USHORT;
break;
default:
pf_sprint_name(fs, pipe);
NOUVEAU_ERR("Unknown format %s\n", fs);
NOUVEAU_ERR("Unknown format %s\n", pf_name(pipe));
return 1;
}
@ -63,8 +60,7 @@ nv30_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
*ncomp = 4;
break;
default:
pf_sprint_name(fs, pipe);
NOUVEAU_ERR("Unknown format %s\n", fs);
NOUVEAU_ERR("Unknown format %s\n", pf_name(pipe));
return 1;
}

4
src/gallium/drivers/nv40/nv40_fragtex.c
View file

@ -45,7 +45,6 @@ static struct nv40_texture_format *
nv40_fragtex_format(uint pipe_format)
{
struct nv40_texture_format *tf = nv40_texture_formats;
char fs[128];
while (tf->defined) {
if (tf->pipe == pipe_format)
@ -53,8 +52,7 @@ nv40_fragtex_format(uint pipe_format)
tf++;
}
pf_sprint_name(fs, pipe_format);
NOUVEAU_ERR("unknown texture format %s\n", fs);
NOUVEAU_ERR("unknown texture format %s\n", pf_name(pipe_format));
return NULL;
}

8
src/gallium/drivers/nv40/nv40_vbo.c
View file

@ -14,8 +14,6 @@
static INLINE int
nv40_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
{
char fs[128];
switch (pipe) {
case PIPE_FORMAT_R32_FLOAT:
case PIPE_FORMAT_R32G32_FLOAT:
@ -36,8 +34,7 @@ nv40_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
*fmt = NV40TCL_VTXFMT_TYPE_USHORT;
break;
default:
pf_sprint_name(fs, pipe);
NOUVEAU_ERR("Unknown format %s\n", fs);
NOUVEAU_ERR("Unknown format %s\n", pf_name(pipe));
return 1;
}
@ -63,8 +60,7 @@ nv40_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
*ncomp = 4;
break;
default:
pf_sprint_name(fs, pipe);
NOUVEAU_ERR("Unknown format %s\n", fs);
NOUVEAU_ERR("Unknown format %s\n", pf_name(pipe));
return 1;
}

14
src/gallium/drivers/nv50/nv50_state_validate.c
View file

@ -58,11 +58,8 @@ nv50_state_validate_fb(struct nv50_context *nv50)
so_data(so, 0xe8);
break;
default:
{
char fmt[128];
pf_sprint_name(fmt, fb->cbufs[i]->format);
NOUVEAU_ERR("AIIII unknown format %s\n", fmt);
}
NOUVEAU_ERR("AIIII unknown format %s\n",
pf_name(fb->cbufs[i]->format));
so_data(so, 0xe6);
break;
}
@ -96,11 +93,8 @@ nv50_state_validate_fb(struct nv50_context *nv50)
so_data(so, 0x15);
break;
default:
{
char fmt[128];
pf_sprint_name(fmt, fb->zsbuf->format);
NOUVEAU_ERR("AIIII unknown format %s\n", fmt);
}
NOUVEAU_ERR("AIIII unknown format %s\n",
pf_name(fb->zsbuf->format));
so_data(so, 0x16);
break;
}

5
src/gallium/drivers/nv50/nv50_vbo.c
View file

@ -215,9 +215,8 @@ nv50_vbo_validate(struct nv50_context *nv50)
break;
default:
{
char fmt[128];
pf_sprint_name(fmt, ve->src_format);
NOUVEAU_ERR("invalid vbo format %s\n", fmt);
NOUVEAU_ERR("invalid vbo format %s\n",
pf_name(ve->src_format));
assert(0);
return;
}