On 31/12/14 03:42, Ilia Mirkin wrote: > The headers hadn't been regenerated in a long time and had seen a number > of manual modifications. A few changes: > - remove nvc0_2d entirely, use the nv50 header which has the nvc0 > values too > - remove 3ddefs, it's identical to the nv50 file > - move macros out into a separate file > > Also the upstream rnndb changed the overall chip naming convention; this > was fixed up manually in the generated files until a better solution is > determined. > > Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> > --- > src/gallium/drivers/nouveau/nvc0/nvc0_2d.xml.h | 380 ------- > src/gallium/drivers/nouveau/nvc0/nvc0_3d.xml.h | 1115 > ++++++++++++++++---- > src/gallium/drivers/nouveau/nvc0/nvc0_3ddefs.xml.h | 98 -- > .../drivers/nouveau/nvc0/nvc0_compute.xml.h | 67 +- > src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 5 +- > src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h | 67 +- > src/gallium/drivers/nouveau/nvc0/nvc0_macros.h | 32 + > src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 6 +- > src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 6 +- > src/gallium/drivers/nouveau/nvc0/nvc0_surface.c | 22 +- > src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 12 +- > src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c | 8 +- > src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h | 4 +- > .../drivers/nouveau/nvc0/nve4_compute.xml.h | 61 +- > src/gallium/drivers/nouveau/nvc0/nve4_p2mf.xml.h | 102 +- > 15 files changed, 1153 insertions(+), 832 deletions(-) > delete mode 100644 src/gallium/drivers/nouveau/nvc0/nvc0_2d.xml.h > delete mode 100644 src/gallium/drivers/nouveau/nvc0/nvc0_3ddefs.xml.h > create mode 100644 src/gallium/drivers/nouveau/nvc0/nvc0_macros.h > Hi Ilia,
Please squash the following before pushing. Thanks. -Emil diff --git a/src/gallium/drivers/nouveau/Makefile.sources b/src/gallium/drivers/nouveau/Makefile.sources index 64f9608..3fae3bc 100644 --- a/src/gallium/drivers/nouveau/Makefile.sources +++ b/src/gallium/drivers/nouveau/Makefile.sources @@ -137,8 +137,6 @@ NVC0_CODEGEN_SOURCES := \ codegen/nv50_ir_target_nvc0.h NVC0_C_SOURCES := \ - nvc0/nvc0_2d.xml.h \ - nvc0/nvc0_3ddefs.xml.h \ nvc0/nvc0_3d.xml.h \ nvc0/nvc0_compute.c \ nvc0/nvc0_compute.h \ @@ -147,6 +145,7 @@ NVC0_C_SOURCES := \ nvc0/nvc0_context.h \ nvc0/nvc0_formats.c \ nvc0/nvc0_m2mf.xml.h \ + nvc0/nvc0_macros.h \ nvc0/nvc0_miptree.c \ nvc0/nvc0_program.c \ nvc0/nvc0_program.h \ _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau