Mesa (master): Move nv30, nv50 and nvc0 to nouveau.
Christoph Bumiller
chrisbmr at kemper.freedesktop.org
Wed Sep 11 19:54:27 UTC 2013
Module: Mesa
Branch: master
Commit: 5eb7ff1175a644ffe3b0f1a75cb235400355f9fb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5eb7ff1175a644ffe3b0f1a75cb235400355f9fb
Author: Johannes Obermayr <johannesobermayr at gmx.de>
Date: Tue Aug 20 20:14:00 2013 +0200
Move nv30, nv50 and nvc0 to nouveau.
It is planned to ship openSUSE 13.1 with -shared libs.
nouveau.la, nv30.la, nv50.la and nvc0.la are currently LIBADDs in all nouveau
related targets.
This change makes it possible to easily build one shared libnouveau.so which is
then LIBADDed.
Also dlopen will be faster for one library instead of three and build time on
-jX will be reduced.
Whitespace fixes were requested by 'git am'.
Signed-off-by: Johannes Obermayr <johannesobermayr at gmx.de>
Acked-by: Christoph Bumiller <christoph.bumiller at speed.at>
Acked-by: Ian Romanick <ian.d.romanick at intel.com>
---
configure.ac | 5 +-
src/gallium/Android.mk | 5 +-
src/gallium/drivers/Makefile.am | 2 +-
src/gallium/drivers/nouveau/Android.mk | 8 ++-
src/gallium/drivers/nouveau/Makefile.am | 14 ++-
src/gallium/drivers/nouveau/Makefile.sources | 91 ++++++++++++++++++++
.../drivers/{nv50 => nouveau}/codegen/nv50_ir.cpp | 8 +-
.../drivers/{nv50 => nouveau}/codegen/nv50_ir.h | 8 +-
.../{nv50 => nouveau}/codegen/nv50_ir_bb.cpp | 2 +-
.../codegen/nv50_ir_build_util.cpp | 4 +-
.../{nv50 => nouveau}/codegen/nv50_ir_build_util.h | 0
.../{nv50 => nouveau}/codegen/nv50_ir_driver.h | 0
.../codegen/nv50_ir_emit_gk110.cpp | 2 +-
.../codegen/nv50_ir_emit_nv50.cpp | 4 +-
.../codegen/nv50_ir_emit_nvc0.cpp | 2 +-
.../codegen/nv50_ir_from_tgsi.cpp | 12 ++--
.../{nv50 => nouveau}/codegen/nv50_ir_graph.cpp | 4 +-
.../{nv50 => nouveau}/codegen/nv50_ir_graph.h | 2 +-
.../{nv50 => nouveau}/codegen/nv50_ir_inlines.h | 0
.../codegen/nv50_ir_lowering_nv50.cpp | 6 +-
.../codegen/nv50_ir_lowering_nvc0.cpp | 6 +-
.../{nv50 => nouveau}/codegen/nv50_ir_peephole.cpp | 6 +-
.../{nv50 => nouveau}/codegen/nv50_ir_print.cpp | 4 +-
.../{nv50 => nouveau}/codegen/nv50_ir_ra.cpp | 4 +-
.../{nv50 => nouveau}/codegen/nv50_ir_ssa.cpp | 6 +-
.../{nv50 => nouveau}/codegen/nv50_ir_target.cpp | 6 +-
.../{nv50 => nouveau}/codegen/nv50_ir_target.h | 2 +-
.../codegen/nv50_ir_target_nv50.cpp | 2 +-
.../codegen/nv50_ir_target_nv50.h | 2 +-
.../codegen/nv50_ir_target_nvc0.cpp | 2 +-
.../codegen/nv50_ir_target_nvc0.h | 2 +-
.../{nv50 => nouveau}/codegen/nv50_ir_util.cpp | 2 +-
.../{nv50 => nouveau}/codegen/nv50_ir_util.h | 2 +-
.../{nvc0 => nouveau}/codegen/target_lib_nvc0.asm | 0
.../codegen/target_lib_nvc0.asm.h | 1 -
.../{nvc0 => nouveau}/codegen/target_lib_nve4.asm | 0
.../codegen/target_lib_nve4.asm.h | 1 -
.../codegen/target_lib_nvf0.asm.h | 0
src/gallium/drivers/nouveau/nouveau_mm.c | 1 -
src/gallium/drivers/nouveau/nouveau_screen.c | 4 +-
src/gallium/drivers/nouveau/nouveau_video.c | 2 +-
.../drivers/{ => nouveau}/nv30/nv01_2d.xml.h | 0
.../drivers/{ => nouveau}/nv30/nv30-40_3d.xml.h | 0
.../drivers/{ => nouveau}/nv30/nv30_clear.c | 10 +-
.../drivers/{ => nouveau}/nv30/nv30_context.c | 12 ++--
.../drivers/{ => nouveau}/nv30/nv30_context.h | 6 +-
src/gallium/drivers/{ => nouveau}/nv30/nv30_draw.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_format.c | 6 +-
.../drivers/{ => nouveau}/nv30/nv30_format.h | 0
.../drivers/{ => nouveau}/nv30/nv30_fragprog.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_fragtex.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_miptree.c | 10 +-
src/gallium/drivers/{ => nouveau}/nv30/nv30_push.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_query.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_resource.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_resource.h | 2 +-
.../drivers/{ => nouveau}/nv30/nv30_screen.c | 18 ++--
.../drivers/{ => nouveau}/nv30/nv30_screen.h | 10 +-
.../drivers/{ => nouveau}/nv30/nv30_state.c | 10 +-
.../drivers/{ => nouveau}/nv30/nv30_state.h | 0
.../{ => nouveau}/nv30/nv30_state_validate.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_texture.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_transfer.c | 12 ++--
.../drivers/{ => nouveau}/nv30/nv30_transfer.h | 0
src/gallium/drivers/{ => nouveau}/nv30/nv30_vbo.c | 10 +-
.../drivers/{ => nouveau}/nv30/nv30_vertprog.c | 8 +-
.../drivers/{ => nouveau}/nv30/nv30_vertprog.h | 2 +-
.../drivers/{ => nouveau}/nv30/nv30_winsys.h | 4 +-
.../drivers/{ => nouveau}/nv30/nv40_vertprog.h | 2 +-
.../drivers/{ => nouveau}/nv30/nv40_verttex.c | 2 +-
.../drivers/{ => nouveau}/nv30/nvfx_fragprog.c | 6 +-
.../drivers/{ => nouveau}/nv30/nvfx_shader.h | 0
.../drivers/{ => nouveau}/nv30/nvfx_vertprog.c | 10 +-
.../drivers/{ => nouveau}/nv50/nv50_2d.xml.h | 0
.../drivers/{ => nouveau}/nv50/nv50_3d.xml.h | 0
.../drivers/{ => nouveau}/nv50/nv50_3ddefs.xml.h | 0
src/gallium/drivers/{ => nouveau}/nv50/nv50_blit.h | 0
.../drivers/{ => nouveau}/nv50/nv50_context.c | 6 +-
.../drivers/{ => nouveau}/nv50/nv50_context.h | 26 +++---
.../drivers/{ => nouveau}/nv50/nv50_debug.h | 0
.../drivers/{ => nouveau}/nv50/nv50_defs.xml.h | 0
src/gallium/drivers/{ => nouveau}/nv50/nv50_draw.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv50_formats.c | 12 ++--
.../drivers/{ => nouveau}/nv50/nv50_miptree.c | 4 +-
.../drivers/{ => nouveau}/nv50/nv50_program.c | 4 +-
.../drivers/{ => nouveau}/nv50/nv50_program.h | 0
src/gallium/drivers/{ => nouveau}/nv50/nv50_push.c | 6 +-
.../drivers/{ => nouveau}/nv50/nv50_query.c | 4 +-
.../drivers/{ => nouveau}/nv50/nv50_resource.c | 4 +-
.../drivers/{ => nouveau}/nv50/nv50_resource.h | 4 +-
.../drivers/{ => nouveau}/nv50/nv50_screen.c | 10 +-
.../drivers/{ => nouveau}/nv50/nv50_screen.h | 14 ++--
.../drivers/{ => nouveau}/nv50/nv50_shader_state.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv50_state.c | 16 ++--
.../{ => nouveau}/nv50/nv50_state_validate.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv50_stateobj.h | 2 +-
.../drivers/{ => nouveau}/nv50/nv50_stateobj_tex.h | 0
.../drivers/{ => nouveau}/nv50/nv50_surface.c | 12 +--
src/gallium/drivers/{ => nouveau}/nv50/nv50_tex.c | 8 +-
.../drivers/{ => nouveau}/nv50/nv50_texture.xml.h | 0
.../drivers/{ => nouveau}/nv50/nv50_transfer.c | 4 +-
.../drivers/{ => nouveau}/nv50/nv50_transfer.h | 0
src/gallium/drivers/{ => nouveau}/nv50/nv50_vbo.c | 6 +-
.../drivers/{ => nouveau}/nv50/nv50_winsys.h | 4 +-
.../drivers/{ => nouveau}/nv50/nv84_video.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv84_video.h | 2 +-
.../drivers/{ => nouveau}/nv50/nv84_video_bsp.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv84_video_vp.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv98_video.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv98_video.h | 6 +-
.../drivers/{ => nouveau}/nv50/nv98_video_bsp.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv98_video_ppp.c | 2 +-
.../drivers/{ => nouveau}/nv50/nv98_video_vp.c | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_2d.xml.h | 0
.../drivers/{ => nouveau}/nvc0/nvc0_3d.xml.h | 0
.../drivers/{ => nouveau}/nvc0/nvc0_3ddefs.xml.h | 0
.../drivers/{ => nouveau}/nvc0/nvc0_compute.c | 4 +-
.../drivers/{ => nouveau}/nvc0/nvc0_compute.h | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_compute.xml.h | 0
.../drivers/{ => nouveau}/nvc0/nvc0_context.c | 6 +-
.../drivers/{ => nouveau}/nvc0/nvc0_context.h | 22 +++---
src/gallium/drivers/{ => nouveau}/nvc0/nvc0_draw.c | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_formats.c | 0
.../drivers/{ => nouveau}/nvc0/nvc0_graph_macros.h | 0
.../drivers/{ => nouveau}/nvc0/nvc0_m2mf.xml.h | 0
.../drivers/{ => nouveau}/nvc0/nvc0_miptree.c | 4 +-
.../drivers/{ => nouveau}/nvc0/nvc0_program.c | 6 +-
.../drivers/{ => nouveau}/nvc0/nvc0_program.h | 0
src/gallium/drivers/{ => nouveau}/nvc0/nvc0_push.c | 6 +-
.../drivers/{ => nouveau}/nvc0/nvc0_query.c | 8 +-
.../drivers/{ => nouveau}/nvc0/nvc0_resource.c | 4 +-
.../drivers/{ => nouveau}/nvc0/nvc0_resource.h | 0
.../drivers/{ => nouveau}/nvc0/nvc0_screen.c | 10 +-
.../drivers/{ => nouveau}/nvc0/nvc0_screen.h | 16 ++--
.../drivers/{ => nouveau}/nvc0/nvc0_shader_state.c | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_state.c | 13 ++--
.../{ => nouveau}/nvc0/nvc0_state_validate.c | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_stateobj.h | 0
.../drivers/{ => nouveau}/nvc0/nvc0_surface.c | 5 +-
src/gallium/drivers/{ => nouveau}/nvc0/nvc0_tex.c | 4 +-
.../drivers/{ => nouveau}/nvc0/nvc0_transfer.c | 2 +-
src/gallium/drivers/{ => nouveau}/nvc0/nvc0_vbo.c | 6 +-
.../{ => nouveau}/nvc0/nvc0_vbo_translate.c | 6 +-
.../drivers/{ => nouveau}/nvc0/nvc0_video.c | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_video.h | 6 +-
.../drivers/{ => nouveau}/nvc0/nvc0_video_bsp.c | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_video_ppp.c | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_video_vp.c | 2 +-
.../drivers/{ => nouveau}/nvc0/nvc0_winsys.h | 4 +-
.../drivers/{ => nouveau}/nvc0/nve4_compute.c | 8 +-
.../drivers/{ => nouveau}/nvc0/nve4_compute.h | 2 +-
.../drivers/{ => nouveau}/nvc0/nve4_compute.xml.h | 0
.../drivers/{ => nouveau}/nvc0/nve4_p2mf.xml.h | 0
src/gallium/drivers/nv30/Android.mk | 37 --------
src/gallium/drivers/nv30/Makefile.am | 34 -------
src/gallium/drivers/nv30/Makefile.sources | 20 -----
src/gallium/drivers/nv50/Android.mk | 37 --------
src/gallium/drivers/nv50/Makefile.am | 34 -------
src/gallium/drivers/nv50/Makefile.sources | 49 -----------
src/gallium/drivers/nvc0/Android.mk | 37 --------
src/gallium/drivers/nvc0/Makefile.am | 34 -------
src/gallium/drivers/nvc0/Makefile.sources | 22 -----
src/gallium/targets/dri-nouveau/Makefile.am | 3 -
src/gallium/targets/egl-static/Makefile.am | 3 -
src/gallium/targets/pipe-loader/Makefile.am | 3 -
src/gallium/targets/vdpau-nouveau/Makefile.am | 3 -
src/gallium/targets/xorg-nouveau/Makefile.am | 3 -
src/gallium/targets/xvmc-nouveau/Makefile.am | 3 -
168 files changed, 430 insertions(+), 662 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=5eb7ff1175a644ffe3b0f1a75cb235400355f9fb
More information about the mesa-commit
mailing list