summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-08-11 16:14:42 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-08-11 16:14:42 +1000
commitdf4228deddea36b9d5b41ea395a216137e046205 (patch)
tree051d9c172689657a2c5670a7d0d3ca1b849d74e6 /src/gallium
parentf56eda6a85912dee9eef9099f6023c6bab05a41a (diff)
nouveau: pf_sprint_name -> pf_name
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nv04/nv04_fragtex.c4
-rw-r--r--src/gallium/drivers/nv30/nv30_fragtex.c3
-rw-r--r--src/gallium/drivers/nv30/nv30_vbo.c8
-rw-r--r--src/gallium/drivers/nv40/nv40_fragtex.c4
-rw-r--r--src/gallium/drivers/nv40/nv40_vbo.c8
-rw-r--r--src/gallium/drivers/nv50/nv50_state_validate.c14
-rw-r--r--src/gallium/drivers/nv50/nv50_vbo.c5
7 files changed, 13 insertions, 33 deletions
diff --git a/src/gallium/drivers/nv04/nv04_fragtex.c b/src/gallium/drivers/nv04/nv04_fragtex.c
index 3db673cd2c..1b866aae19 100644
--- a/src/gallium/drivers/nv04/nv04_fragtex.c
+++ b/src/gallium/drivers/nv04/nv04_fragtex.c
@@ -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;
}
diff --git a/src/gallium/drivers/nv30/nv30_fragtex.c b/src/gallium/drivers/nv30/nv30_fragtex.c
index 4242f86f76..91246f5ca0 100644
--- a/src/gallium/drivers/nv30/nv30_fragtex.c
+++ b/src/gallium/drivers/nv30/nv30_fragtex.c
@@ -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;
}
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index d930557f6b..b1c73793bf 100644
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -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;
}
diff --git a/src/gallium/drivers/nv40/nv40_fragtex.c b/src/gallium/drivers/nv40/nv40_fragtex.c
index 2d45c2545c..566d5a8d5b 100644
--- a/src/gallium/drivers/nv40/nv40_fragtex.c
+++ b/src/gallium/drivers/nv40/nv40_fragtex.c
@@ -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;
}
diff --git a/src/gallium/drivers/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c
index 93669e6192..755d5586b7 100644
--- a/src/gallium/drivers/nv40/nv40_vbo.c
+++ b/src/gallium/drivers/nv40/nv40_vbo.c
@@ -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;
}
diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index 8f9ee05acc..198e25f448 100644
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -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;
}
diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index 8e420ad172..c94531723b 100644
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -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;
}