fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-28 20:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

nv: Use util_format_name().

Browse source
This commit is contained in:
José Fonseca 2010-02-14 13:26:30 +00:00
parent 06f76e4a6b
commit db2df0aa9b
6 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,5 @@
#include "util/u_format.h"
#include "nv30_context.h"
#include "nouveau/nouveau_util.h"
@ -50,7 +52,7 @@ nv30_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;
}

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

@ -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 "nv30_context.h"
#include "nv30_state.h"
@ -34,7 +35,7 @@ nv30_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
*fmt = NV34TCL_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 @@ nv30_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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}