fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nv50-: switch nv50_formats.c to updated g80_defs.xml.h

Browse source 
Verified (binary diff) to produce identical code.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Ben Skeggs 2016-02-15 15:37:29 +10:00
parent 3444f83077
commit b04b16754c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/drivers/nouveau/nv50/nv50_formats.c
View file

@ -28,7 +28,7 @@
# include "nv50/nv50_3d.xml.h"
#endif
#include "nv50/nv50_texture.xml.h"
#include "nv50/nv50_defs.xml.h"
#include "nv50/g80_defs.xml.h"
#include "pipe/p_defines.h"
@ -59,8 +59,8 @@
# define U_t 0
#endif
#define NV50_ZETA_FORMAT_NONE 0
#define NV50_SURFACE_FORMAT_NONE 0
#define G80_ZETA_FORMAT_NONE 0
#define G80_SURFACE_FORMAT_NONE 0
#define SF_A(sz) NV50_TIC_0_FMT_##sz
#define SF_C(sz) NVC0_TIC_0_FMT_##sz
@ -79,19 +79,19 @@
}
#define C4(c, p, n, r, g, b, a, t, s, u) \
SF(c, p, NV50_SURFACE_FORMAT_##n, r, g, b, a, t, t, t, t, s, u)
SF(c, p, G80_SURFACE_FORMAT_##n, r, g, b, a, t, t, t, t, s, u)
#define ZX(c, p, n, r, g, b, a, t, s, u) \
SF(c, p, NV50_ZETA_FORMAT_##n, \
SF(c, p, G80_ZETA_FORMAT_##n, \
r, g, b, ONE_FLOAT, t, UINT, UINT, UINT, s, u)
#define ZS(c, p, n, r, g, b, a, t, s, u) \
SF(c, p, NV50_ZETA_FORMAT_##n, \
SF(c, p, G80_ZETA_FORMAT_##n, \
r, g, b, ONE_FLOAT, t, UINT, UINT, UINT, s, u)
#define SZ(c, p, n, r, g, b, a, t, s, u) \
SF(c, p, NV50_ZETA_FORMAT_##n, \
SF(c, p, G80_ZETA_FORMAT_##n, \
r, g, b, ONE_FLOAT, UINT, t, UINT, UINT, s, u)
#define SX(c, p, r, s, u) \
SF(c, p, NV50_ZETA_FORMAT_NONE, \
SF(c, p, G80_ZETA_FORMAT_NONE, \
r, r, r, r, UINT, UINT, UINT, UINT, s, u)
#define F3(c, p, n, r, g, b, a, t, s, u) \