diff options
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/Android.mk | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/Makefile.am | 14 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/Makefile.sources | 91 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir.cpp) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir.h (renamed from src/gallium/drivers/nv50/codegen/nv50_ir.h) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_bb.cpp) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_build_util.cpp) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.h (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_build_util.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_driver.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp (renamed from src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp (renamed from src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp) | 12 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_graph.cpp) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_graph.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_inlines.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp (renamed from src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_ssa.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_target.cpp) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target.h (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_target.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_target_nv50.cpp) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.h (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_target_nv50.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp (renamed from src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.h (renamed from src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_util.cpp (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_util.cpp) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_util.h (renamed from src/gallium/drivers/nv50/codegen/nv50_ir_util.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/target_lib_nvc0.asm (renamed from src/gallium/drivers/nvc0/codegen/target_lib_nvc0.asm) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/target_lib_nvc0.asm.h (renamed from src/gallium/drivers/nvc0/codegen/target_lib_nvc0.asm.h) | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/target_lib_nve4.asm (renamed from src/gallium/drivers/nvc0/codegen/target_lib_nve4.asm) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/target_lib_nve4.asm.h (renamed from src/gallium/drivers/nvc0/codegen/target_lib_nve4.asm.h) | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/target_lib_nvf0.asm.h (renamed from src/gallium/drivers/nvc0/codegen/target_lib_nvf0.asm.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nouveau_mm.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nouveau_screen.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nouveau_video.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv01_2d.xml.h (renamed from src/gallium/drivers/nv30/nv01_2d.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30-40_3d.xml.h (renamed from src/gallium/drivers/nv30/nv30-40_3d.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_clear.c (renamed from src/gallium/drivers/nv30/nv30_clear.c) | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_context.c (renamed from src/gallium/drivers/nv30/nv30_context.c) | 12 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_context.h (renamed from src/gallium/drivers/nv30/nv30_context.h) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_draw.c (renamed from src/gallium/drivers/nv30/nv30_draw.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_format.c (renamed from src/gallium/drivers/nv30/nv30_format.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_format.h (renamed from src/gallium/drivers/nv30/nv30_format.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_fragprog.c (renamed from src/gallium/drivers/nv30/nv30_fragprog.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_fragtex.c (renamed from src/gallium/drivers/nv30/nv30_fragtex.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_miptree.c (renamed from src/gallium/drivers/nv30/nv30_miptree.c) | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_push.c (renamed from src/gallium/drivers/nv30/nv30_push.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_query.c (renamed from src/gallium/drivers/nv30/nv30_query.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_resource.c (renamed from src/gallium/drivers/nv30/nv30_resource.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_resource.h (renamed from src/gallium/drivers/nv30/nv30_resource.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_screen.c (renamed from src/gallium/drivers/nv30/nv30_screen.c) | 20 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_screen.h (renamed from src/gallium/drivers/nv30/nv30_screen.h) | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_state.c (renamed from src/gallium/drivers/nv30/nv30_state.c) | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_state.h (renamed from src/gallium/drivers/nv30/nv30_state.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_state_validate.c (renamed from src/gallium/drivers/nv30/nv30_state_validate.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_texture.c (renamed from src/gallium/drivers/nv30/nv30_texture.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_transfer.c (renamed from src/gallium/drivers/nv30/nv30_transfer.c) | 12 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_transfer.h (renamed from src/gallium/drivers/nv30/nv30_transfer.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_vbo.c (renamed from src/gallium/drivers/nv30/nv30_vbo.c) | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_vertprog.c (renamed from src/gallium/drivers/nv30/nv30_vertprog.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_vertprog.h (renamed from src/gallium/drivers/nv30/nv30_vertprog.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_winsys.h (renamed from src/gallium/drivers/nv30/nv30_winsys.h) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv40_vertprog.h (renamed from src/gallium/drivers/nv30/nv40_vertprog.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv40_verttex.c (renamed from src/gallium/drivers/nv30/nv40_verttex.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c (renamed from src/gallium/drivers/nv30/nvfx_fragprog.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nvfx_shader.h (renamed from src/gallium/drivers/nv30/nvfx_shader.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c (renamed from src/gallium/drivers/nv30/nvfx_vertprog.c) | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h (renamed from src/gallium/drivers/nv50/nv50_2d.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_3d.xml.h (renamed from src/gallium/drivers/nv50/nv50_3d.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_3ddefs.xml.h (renamed from src/gallium/drivers/nv50/nv50_3ddefs.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_blit.h (renamed from src/gallium/drivers/nv50/nv50_blit.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_context.c (renamed from src/gallium/drivers/nv50/nv50_context.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_context.h (renamed from src/gallium/drivers/nv50/nv50_context.h) | 28 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_debug.h (renamed from src/gallium/drivers/nv50/nv50_debug.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_defs.xml.h (renamed from src/gallium/drivers/nv50/nv50_defs.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_draw.c (renamed from src/gallium/drivers/nv50/nv50_draw.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_formats.c (renamed from src/gallium/drivers/nv50/nv50_formats.c) | 12 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_miptree.c (renamed from src/gallium/drivers/nv50/nv50_miptree.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_program.c (renamed from src/gallium/drivers/nv50/nv50_program.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_program.h (renamed from src/gallium/drivers/nv50/nv50_program.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_push.c (renamed from src/gallium/drivers/nv50/nv50_push.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_query.c (renamed from src/gallium/drivers/nv50/nv50_query.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_resource.c (renamed from src/gallium/drivers/nv50/nv50_resource.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_resource.h (renamed from src/gallium/drivers/nv50/nv50_resource.h) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_screen.c (renamed from src/gallium/drivers/nv50/nv50_screen.c) | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_screen.h (renamed from src/gallium/drivers/nv50/nv50_screen.h) | 14 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_shader_state.c (renamed from src/gallium/drivers/nv50/nv50_shader_state.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_state.c (renamed from src/gallium/drivers/nv50/nv50_state.c) | 16 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_state_validate.c (renamed from src/gallium/drivers/nv50/nv50_state_validate.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_stateobj.h (renamed from src/gallium/drivers/nv50/nv50_stateobj.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_stateobj_tex.h (renamed from src/gallium/drivers/nv50/nv50_stateobj_tex.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_surface.c (renamed from src/gallium/drivers/nv50/nv50_surface.c) | 12 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_tex.c (renamed from src/gallium/drivers/nv50/nv50_tex.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_texture.xml.h (renamed from src/gallium/drivers/nv50/nv50_texture.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_transfer.c (renamed from src/gallium/drivers/nv50/nv50_transfer.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_transfer.h (renamed from src/gallium/drivers/nv50/nv50_transfer.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_vbo.c (renamed from src/gallium/drivers/nv50/nv50_vbo.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_winsys.h (renamed from src/gallium/drivers/nv50/nv50_winsys.h) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv84_video.c (renamed from src/gallium/drivers/nv50/nv84_video.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv84_video.h (renamed from src/gallium/drivers/nv50/nv84_video.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c (renamed from src/gallium/drivers/nv50/nv84_video_bsp.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv84_video_vp.c (renamed from src/gallium/drivers/nv50/nv84_video_vp.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv98_video.c (renamed from src/gallium/drivers/nv50/nv98_video.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv98_video.h (renamed from src/gallium/drivers/nv50/nv98_video.h) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv98_video_bsp.c (renamed from src/gallium/drivers/nv50/nv98_video_bsp.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv98_video_ppp.c (renamed from src/gallium/drivers/nv50/nv98_video_ppp.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv98_video_vp.c (renamed from src/gallium/drivers/nv50/nv98_video_vp.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_2d.xml.h (renamed from src/gallium/drivers/nvc0/nvc0_2d.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_3d.xml.h (renamed from src/gallium/drivers/nvc0/nvc0_3d.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_3ddefs.xml.h (renamed from src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_compute.c (renamed from src/gallium/drivers/nvc0/nvc0_compute.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_compute.h (renamed from src/gallium/drivers/nvc0/nvc0_compute.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_compute.xml.h (renamed from src/gallium/drivers/nvc0/nvc0_compute.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_context.c (renamed from src/gallium/drivers/nvc0/nvc0_context.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_context.h (renamed from src/gallium/drivers/nvc0/nvc0_context.h) | 22 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_draw.c (renamed from src/gallium/drivers/nvc0/nvc0_draw.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_formats.c (renamed from src/gallium/drivers/nvc0/nvc0_formats.c) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_graph_macros.h (renamed from src/gallium/drivers/nvc0/nvc0_graph_macros.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h (renamed from src/gallium/drivers/nvc0/nvc0_m2mf.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c (renamed from src/gallium/drivers/nvc0/nvc0_miptree.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_program.c (renamed from src/gallium/drivers/nvc0/nvc0_program.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_program.h (renamed from src/gallium/drivers/nvc0/nvc0_program.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_push.c (renamed from src/gallium/drivers/nvc0/nvc0_push.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_query.c (renamed from src/gallium/drivers/nvc0/nvc0_query.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_resource.c (renamed from src/gallium/drivers/nvc0/nvc0_resource.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_resource.h (renamed from src/gallium/drivers/nvc0/nvc0_resource.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_screen.c (renamed from src/gallium/drivers/nvc0/nvc0_screen.c) | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_screen.h (renamed from src/gallium/drivers/nvc0/nvc0_screen.h) | 16 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c (renamed from src/gallium/drivers/nvc0/nvc0_shader_state.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_state.c (renamed from src/gallium/drivers/nvc0/nvc0_state.c) | 13 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c (renamed from src/gallium/drivers/nvc0/nvc0_state_validate.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_stateobj.h (renamed from src/gallium/drivers/nvc0/nvc0_stateobj.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_surface.c (renamed from src/gallium/drivers/nvc0/nvc0_surface.c) | 5 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_tex.c (renamed from src/gallium/drivers/nvc0/nvc0_tex.c) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c (renamed from src/gallium/drivers/nvc0/nvc0_transfer.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c (renamed from src/gallium/drivers/nvc0/nvc0_vbo.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c (renamed from src/gallium/drivers/nvc0/nvc0_vbo_translate.c) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_video.c (renamed from src/gallium/drivers/nvc0/nvc0_video.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_video.h (renamed from src/gallium/drivers/nvc0/nvc0_video.h) | 6 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_video_bsp.c (renamed from src/gallium/drivers/nvc0/nvc0_video_bsp.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_video_ppp.c (renamed from src/gallium/drivers/nvc0/nvc0_video_ppp.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_video_vp.c (renamed from src/gallium/drivers/nvc0/nvc0_video_vp.c) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h (renamed from src/gallium/drivers/nvc0/nvc0_winsys.h) | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nve4_compute.c (renamed from src/gallium/drivers/nvc0/nve4_compute.c) | 8 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nve4_compute.h (renamed from src/gallium/drivers/nvc0/nve4_compute.h) | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nve4_compute.xml.h (renamed from src/gallium/drivers/nvc0/nve4_compute.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nve4_p2mf.xml.h (renamed from src/gallium/drivers/nvc0/nve4_p2mf.xml.h) | 0 | ||||
-rw-r--r-- | src/gallium/drivers/nv30/Android.mk | 37 | ||||
-rw-r--r-- | src/gallium/drivers/nv30/Makefile.am | 34 | ||||
-rw-r--r-- | src/gallium/drivers/nv30/Makefile.sources | 20 | ||||
-rw-r--r-- | src/gallium/drivers/nv50/Android.mk | 37 | ||||
-rw-r--r-- | src/gallium/drivers/nv50/Makefile.am | 34 | ||||
-rw-r--r-- | src/gallium/drivers/nv50/Makefile.sources | 49 | ||||
-rw-r--r-- | src/gallium/drivers/nvc0/Android.mk | 37 | ||||
-rw-r--r-- | src/gallium/drivers/nvc0/Makefile.am | 34 | ||||
-rw-r--r-- | src/gallium/drivers/nvc0/Makefile.sources | 22 |
160 files changed, 430 insertions, 638 deletions
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am index 22f54b7..171d102 100644 --- a/src/gallium/drivers/Makefile.am +++ b/src/gallium/drivers/Makefile.am @@ -86,7 +86,7 @@ endif if HAVE_GALLIUM_NOUVEAU -SUBDIRS += nouveau nv30 nv50 nvc0 +SUBDIRS += nouveau endif diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk index 782b7ce..5275aa6 100644 --- a/src/gallium/drivers/nouveau/Android.mk +++ b/src/gallium/drivers/nouveau/Android.mk @@ -28,7 +28,13 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(C_SOURCES) +LOCAL_SRC_FILES := $(C_SOURCES) \ + $(NV30_C_SOURCES) \ + $(NV50_CODEGEN_SOURCES) \ + $(NV50_C_SOURES) \ + $(NVC0_CODEGEN_SOURCES) \ + $(NVC0_C_SOURCES) + LOCAL_C_INCLUDES := $(DRM_TOP) \ $(DRM_TOP)/include/drm \ $(DRM_TOP)/nouveau diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am index 12e3da0..c4b51d9 100644 --- a/src/gallium/drivers/nouveau/Makefile.am +++ b/src/gallium/drivers/nouveau/Makefile.am @@ -27,9 +27,15 @@ noinst_LTLIBRARIES = libnouveau.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers/nouveau/include \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/include \ $(GALLIUM_CFLAGS) \ - $(LIBDRM_CFLAGS) + $(LIBDRM_CFLAGS) \ + $(NOUVEAU_CFLAGS) \ + $(VISIBILITY_CFLAGS) -libnouveau_la_SOURCES = $(C_SOURCES) +libnouveau_la_SOURCES = \ + $(C_SOURCES) \ + $(NV30_C_SOURCES) \ + $(NV50_CODEGEN_SOURCES) \ + $(NV50_C_SOURCES) \ + $(NVC0_CODEGEN_SOURCES) \ + $(NVC0_C_SOURCES) diff --git a/src/gallium/drivers/nouveau/Makefile.sources b/src/gallium/drivers/nouveau/Makefile.sources index 7912f67..cc84ec3 100644 --- a/src/gallium/drivers/nouveau/Makefile.sources +++ b/src/gallium/drivers/nouveau/Makefile.sources @@ -8,3 +8,94 @@ C_SOURCES := \ nouveau_vp3_video.c \ nouveau_vp3_video_bsp.c \ nouveau_vp3_video_vp.c + +NV30_C_SOURCES := \ + nv30/nv30_screen.c \ + nv30/nv30_context.c \ + nv30/nv30_format.c \ + nv30/nv30_resource.c \ + nv30/nv30_transfer.c \ + nv30/nv30_miptree.c \ + nv30/nv30_state.c \ + nv30/nv30_state_validate.c \ + nv30/nv30_texture.c \ + nv30/nv30_fragtex.c \ + nv30/nv40_verttex.c \ + nv30/nv30_fragprog.c \ + nv30/nv30_vertprog.c \ + nv30/nv30_clear.c \ + nv30/nv30_vbo.c \ + nv30/nv30_push.c \ + nv30/nv30_draw.c \ + nv30/nv30_query.c \ + nv30/nvfx_vertprog.c \ + nv30/nvfx_fragprog.c + +NV50_C_SOURCES := \ + nv50/nv50_context.c \ + nv50/nv50_formats.c \ + nv50/nv50_miptree.c \ + nv50/nv50_resource.c \ + nv50/nv50_screen.c \ + nv50/nv50_state.c \ + nv50/nv50_state_validate.c \ + nv50/nv50_surface.c \ + nv50/nv50_tex.c \ + nv50/nv50_transfer.c \ + nv50/nv50_vbo.c \ + nv50/nv50_program.c \ + nv50/nv50_shader_state.c \ + nv50/nv50_push.c \ + nv50/nv50_query.c \ + nv50/nv84_video.c \ + nv50/nv84_video_bsp.c \ + nv50/nv84_video_vp.c \ + nv50/nv98_video.c \ + nv50/nv98_video_bsp.c \ + nv50/nv98_video_vp.c \ + nv50/nv98_video_ppp.c + +NV50_CODEGEN_SOURCES := \ + codegen/nv50_ir.cpp \ + codegen/nv50_ir_bb.cpp \ + codegen/nv50_ir_build_util.cpp \ + codegen/nv50_ir_emit_nv50.cpp \ + codegen/nv50_ir_from_tgsi.cpp \ + codegen/nv50_ir_graph.cpp \ + codegen/nv50_ir_lowering_nv50.cpp \ + codegen/nv50_ir_peephole.cpp \ + codegen/nv50_ir_print.cpp \ + codegen/nv50_ir_ra.cpp \ + codegen/nv50_ir_ssa.cpp \ + codegen/nv50_ir_target.cpp \ + codegen/nv50_ir_target_nv50.cpp \ + codegen/nv50_ir_util.cpp + +NVC0_CODEGEN_SOURCES := \ + codegen/nv50_ir_emit_gk110.cpp \ + codegen/nv50_ir_emit_nvc0.cpp \ + codegen/nv50_ir_lowering_nvc0.cpp \ + codegen/nv50_ir_target_nvc0.cpp + +NVC0_C_SOURCES := \ + nvc0/nvc0_compute.c \ + nvc0/nvc0_context.c \ + nvc0/nvc0_formats.c \ + nvc0/nvc0_miptree.c \ + nvc0/nvc0_resource.c \ + nvc0/nvc0_screen.c \ + nvc0/nvc0_state.c \ + nvc0/nvc0_state_validate.c \ + nvc0/nvc0_surface.c \ + nvc0/nvc0_tex.c \ + nvc0/nvc0_transfer.c \ + nvc0/nvc0_vbo.c \ + nvc0/nvc0_vbo_translate.c \ + nvc0/nvc0_program.c \ + nvc0/nvc0_shader_state.c \ + nvc0/nvc0_query.c \ + nvc0/nve4_compute.c \ + nvc0/nvc0_video.c \ + nvc0/nvc0_video_bsp.c \ + nvc0/nvc0_video_vp.c \ + nvc0/nvc0_video_ppp.c diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp index 752ec85..90fb51c 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir.h" -#include "nv50_ir_target.h" -#include "nv50_ir_driver.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_target.h" +#include "codegen/nv50_ir_driver.h" extern "C" { #include "nv50/nv50_program.h" @@ -1131,7 +1131,7 @@ nv50_ir_init_prog_info(struct nv50_ir_prog_info *info) info->io.sampleMask = 0xff; info->io.backFaceColor[0] = info->io.backFaceColor[1] = 0xff; } - + int nv50_ir_generate_code(struct nv50_ir_prog_info *info) { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h index 772ad1d..68c76e5 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h @@ -30,10 +30,10 @@ #include <list> #include <vector> -#include "nv50_ir_util.h" -#include "nv50_ir_graph.h" +#include "codegen/nv50_ir_util.h" +#include "codegen/nv50_ir_graph.h" -#include "nv50_ir_driver.h" +#include "codegen/nv50_ir_driver.h" namespace nv50_ir { @@ -1190,7 +1190,7 @@ protected: // ============================================================================= -#include "nv50_ir_inlines.h" +#include "codegen/nv50_ir_inlines.h" } // namespace nv50_ir diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_bb.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp index 304aa67..51b9225 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_bb.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir.h" +#include "codegen/nv50_ir.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_build_util.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.cpp index c4cbad3..70e5e22 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_build_util.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.cpp @@ -20,8 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir.h" -#include "nv50_ir_build_util.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_build_util.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_build_util.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.h index 2305a27..2305a27 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_build_util.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.h diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_driver.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h index 752bad3..752bad3 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_driver.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp index e752e90..ac59187 100644 --- a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir_target_nvc0.h" +#include "codegen/nv50_ir_target_nvc0.h" // CodeEmitter for GK110 encoding of the Fermi/Kepler ISA. diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp index 9472bf5..3eca27d 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp @@ -20,8 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir.h" -#include "nv50_ir_target_nv50.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_target_nv50.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp index 72f80ac..90c409d 100644 --- a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir_target_nvc0.h" +#include "codegen/nv50_ir_target_nvc0.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp index a2ad9f4..3193ea6 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp @@ -28,9 +28,9 @@ extern "C" { #include <set> -#include "nv50_ir.h" -#include "nv50_ir_util.h" -#include "nv50_ir_build_util.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_util.h" +#include "codegen/nv50_ir_build_util.h" namespace tgsi { @@ -382,7 +382,7 @@ static nv50_ir::TexTarget translateTexture(uint tex) return nv50_ir::TEX_TARGET_2D; } } - + nv50_ir::DataType Instruction::inferSrcType() const { switch (getOpcode()) { @@ -490,7 +490,7 @@ nv50_ir::CondCode Instruction::getSetCond() const } #define NV50_IR_OPCODE_CASE(a, b) case TGSI_OPCODE_##a: return nv50_ir::OP_##b - + static nv50_ir::operation translateOpcode(uint opcode) { switch (opcode) { @@ -2151,7 +2151,7 @@ Converter::handleInstruction(const struct tgsi_full_instruction *insn) src1 = fetchSrc(1, c); src2 = fetchSrc(2, c); mkOp3(op, dstTy, dst0[c], src0, src1, src2); - } + } break; case TGSI_OPCODE_MOV: case TGSI_OPCODE_ABS: diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_graph.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp index f90986e..3f8d00a 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_graph.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir_graph.h" +#include "codegen/nv50_ir_graph.h" #include <limits> #include <list> #include <stack> -#include "nv50_ir.h" +#include "codegen/nv50_ir.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_graph.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h index d770790..b0981ff 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_graph.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h @@ -23,7 +23,7 @@ #ifndef __NV50_IR_GRAPH_H__ #define __NV50_IR_GRAPH_H__ -#include "nv50_ir_util.h" +#include "codegen/nv50_ir_util.h" #include <vector> namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_inlines.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h index 255324f..255324f 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_inlines.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp index d88cd84..56eaad3 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50/codegen/nv50_ir.h" -#include "nv50/codegen/nv50_ir_build_util.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_build_util.h" -#include "nv50_ir_target_nv50.h" +#include "codegen/nv50_ir_target_nv50.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp index 1832e1a..8d94dd1 100644 --- a/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50/codegen/nv50_ir.h" -#include "nv50/codegen/nv50_ir_build_util.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_build_util.h" -#include "nv50_ir_target_nvc0.h" +#include "codegen/nv50_ir_target_nvc0.h" #include <limits> diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp index 93a97ae..99bd2bf 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir.h" -#include "nv50_ir_target.h" -#include "nv50_ir_build_util.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_target.h" +#include "codegen/nv50_ir_build_util.h" extern "C" { #include "util/u_math.h" diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp index 9ef02e9..ee39b3c 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp @@ -20,8 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir.h" -#include "nv50_ir_target.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_target.h" #define __STDC_FORMAT_MACROS #include <inttypes.h> diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp index 40f2f6b..d65003c 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp @@ -20,8 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir.h" -#include "nv50_ir_target.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_target.h" #include <stack> #include <limits> diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ssa.cpp index 979bb49..2e43234 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ssa.cpp @@ -20,8 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir.h" -#include "nv50_ir_target.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_target.h" namespace nv50_ir { @@ -34,7 +34,7 @@ class DominatorTree : public Graph public: DominatorTree(Graph *cfg); ~DominatorTree() { } - + bool dominates(BasicBlock *, BasicBlock *); void findDominanceFrontiers(); diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_target.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp index 09d4d38..443acfc 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_target.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp @@ -20,8 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50/codegen/nv50_ir.h" -#include "nv50/codegen/nv50_ir_target.h" +#include "codegen/nv50_ir.h" +#include "codegen/nv50_ir_target.h" namespace nv50_ir { @@ -437,7 +437,7 @@ RelocEntry::apply(uint32_t *binary, const RelocInfo *info) const } // namespace nv50_ir -#include "nv50/codegen/nv50_ir_driver.h" +#include "codegen/nv50_ir_driver.h" extern "C" { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_target.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.h index 9729b5e..9913ca1 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_target.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.h @@ -23,7 +23,7 @@ #ifndef __NV50_IR_TARGET_H__ #define __NV50_IR_TARGET_H__ -#include "nv50_ir.h" +#include "codegen/nv50_ir.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp index 9dea896..ade9be0 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_target_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir_target_nv50.h" +#include "codegen/nv50_ir_target_nv50.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_target_nv50.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.h index 78ae416..0cbf180 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_target_nv50.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.h @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50/codegen/nv50_ir_target.h" +#include "codegen/nv50_ir_target.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp index 4ee1a67..47e9c55 100644 --- a/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir_target_nvc0.h" +#include "codegen/nv50_ir_target_nvc0.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.h index 8f8a77c..7831af5 100644 --- a/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.h @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50/codegen/nv50_ir_target.h" +#include "codegen/nv50_ir_target.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_util.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_util.cpp index 2a14ba6..8959777 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_util.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_util.cpp @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_ir_util.h" +#include "codegen/nv50_ir_util.h" namespace nv50_ir { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_util.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h index a97e944..a4ea9d9 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_util.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h @@ -244,7 +244,7 @@ public: Item() { memset(&u, 0, sizeof(u)); } }; - + Stack() : size(0), limit(0), array(0) { } ~Stack() { if (array) FREE(array); } diff --git a/src/gallium/drivers/nvc0/codegen/target_lib_nvc0.asm b/src/gallium/drivers/nouveau/codegen/target_lib_nvc0.asm index f40becc..f40becc 100644 --- a/src/gallium/drivers/nvc0/codegen/target_lib_nvc0.asm +++ b/src/gallium/drivers/nouveau/codegen/target_lib_nvc0.asm diff --git a/src/gallium/drivers/nvc0/codegen/target_lib_nvc0.asm.h b/src/gallium/drivers/nouveau/codegen/target_lib_nvc0.asm.h index e5e7475..3790504 100644 --- a/src/gallium/drivers/nvc0/codegen/target_lib_nvc0.asm.h +++ b/src/gallium/drivers/nouveau/codegen/target_lib_nvc0.asm.h @@ -110,4 +110,3 @@ static const uint16_t nvc0_builtin_offsets[NVC0_BUILTIN_COUNT] = 0x0180, 0x0188 }; - diff --git a/src/gallium/drivers/nvc0/codegen/target_lib_nve4.asm b/src/gallium/drivers/nouveau/codegen/target_lib_nve4.asm index 5adc9ff..5adc9ff 100644 --- a/src/gallium/drivers/nvc0/codegen/target_lib_nve4.asm +++ b/src/gallium/drivers/nouveau/codegen/target_lib_nve4.asm diff --git a/src/gallium/drivers/nvc0/codegen/target_lib_nve4.asm.h b/src/gallium/drivers/nouveau/codegen/target_lib_nve4.asm.h index ad386f8..53fa12c 100644 --- a/src/gallium/drivers/nvc0/codegen/target_lib_nve4.asm.h +++ b/src/gallium/drivers/nouveau/codegen/target_lib_nve4.asm.h @@ -590,4 +590,3 @@ static const uint16_t nve4_builtin_offsets[NVC0_BUILTIN_COUNT] = 0x0f08, 0x0f18, }; - diff --git a/src/gallium/drivers/nvc0/codegen/target_lib_nvf0.asm.h b/src/gallium/drivers/nouveau/codegen/target_lib_nvf0.asm.h index d10b6b0..d10b6b0 100644 --- a/src/gallium/drivers/nvc0/codegen/target_lib_nvf0.asm.h +++ b/src/gallium/drivers/nouveau/codegen/target_lib_nvf0.asm.h diff --git a/src/gallium/drivers/nouveau/nouveau_mm.c b/src/gallium/drivers/nouveau/nouveau_mm.c index 439c0fb..87f2f46 100644 --- a/src/gallium/drivers/nouveau/nouveau_mm.c +++ b/src/gallium/drivers/nouveau/nouveau_mm.c @@ -296,4 +296,3 @@ nouveau_mm_destroy(struct nouveau_mman *cache) FREE(cache); } - diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c index d129a55..5b35ee4 100644 --- a/src/gallium/drivers/nouveau/nouveau_screen.c +++ b/src/gallium/drivers/nouveau/nouveau_screen.c @@ -85,7 +85,7 @@ nouveau_screen_bo_from_handle(struct pipe_screen *pscreen, struct nouveau_device *dev = nouveau_screen(pscreen)->device; struct nouveau_bo *bo = 0; int ret; - + ret = nouveau_bo_name_ref(dev, whandle->handle, &bo); if (ret) { debug_printf("%s: ref name 0x%08x failed with %d\n", @@ -106,7 +106,7 @@ nouveau_screen_bo_get_handle(struct pipe_screen *pscreen, { whandle->stride = stride; - if (whandle->type == DRM_API_HANDLE_TYPE_SHARED) { + if (whandle->type == DRM_API_HANDLE_TYPE_SHARED) { return nouveau_bo_name_get(bo, &whandle->handle) == 0; } else if (whandle->type == DRM_API_HANDLE_TYPE_KMS) { whandle->handle = bo->handle; diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index 8e08cab..7deea88 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -27,7 +27,7 @@ #include "nouveau_context.h" #include "nouveau_video.h" -#include "nouveau/nouveau_buffer.h" +#include "nouveau_buffer.h" #include "util/u_video.h" #include "util/u_format.h" #include "util/u_sampler.h" diff --git a/src/gallium/drivers/nv30/nv01_2d.xml.h b/src/gallium/drivers/nouveau/nv30/nv01_2d.xml.h index afae00c..afae00c 100644 --- a/src/gallium/drivers/nv30/nv01_2d.xml.h +++ b/src/gallium/drivers/nouveau/nv30/nv01_2d.xml.h diff --git a/src/gallium/drivers/nv30/nv30-40_3d.xml.h b/src/gallium/drivers/nouveau/nv30/nv30-40_3d.xml.h index 447f4b3..447f4b3 100644 --- a/src/gallium/drivers/nv30/nv30-40_3d.xml.h +++ b/src/gallium/drivers/nouveau/nv30/nv30-40_3d.xml.h diff --git a/src/gallium/drivers/nv30/nv30_clear.c b/src/gallium/drivers/nouveau/nv30/nv30_clear.c index 8992de3..5317e89 100644 --- a/src/gallium/drivers/nv30/nv30_clear.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_clear.c @@ -26,11 +26,11 @@ #include "pipe/p_defines.h" #include "util/u_pack_color.h" -#include "nouveau/nouveau_gldefs.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_format.h" +#include "nouveau_gldefs.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_format.h" static INLINE uint32_t pack_rgba(enum pipe_format format, const float *rgba) diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nouveau/nv30/nv30_context.c index acef493..2146d27 100644 --- a/src/gallium/drivers/nv30/nv30_context.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_context.c @@ -25,13 +25,13 @@ #include "draw/draw_context.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" -#include "nouveau/nouveau_fence.h" -#include "nv30_context.h" -#include "nv30_transfer.h" -#include "nv30_state.h" +#include "nouveau_fence.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_transfer.h" +#include "nv30/nv30_state.h" static void nv30_context_kick_notify(struct nouveau_pushbuf *push) diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nouveau/nv30/nv30_context.h index 3009a0c..12ae0c7 100644 --- a/src/gallium/drivers/nv30/nv30_context.h +++ b/src/gallium/drivers/nouveau/nv30/nv30_context.h @@ -4,10 +4,10 @@ #include "pipe/p_format.h" #include "util/u_blitter.h" -#include "nv30_screen.h" -#include "nv30_state.h" +#include "nv30/nv30_screen.h" +#include "nv30/nv30_state.h" -#include "nouveau/nouveau_context.h" +#include "nouveau_context.h" #define BUFCTX_FB 0 #define BUFCTX_VTXTMP 1 diff --git a/src/gallium/drivers/nv30/nv30_draw.c b/src/gallium/drivers/nouveau/nv30/nv30_draw.c index 85b4fcd..3575c3d 100644 --- a/src/gallium/drivers/nv30/nv30_draw.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_draw.c @@ -29,10 +29,10 @@ #include "draw/draw_vbuf.h" #include "draw/draw_private.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_format.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_format.h" struct nv30_render { struct vbuf_render base; diff --git a/src/gallium/drivers/nv30/nv30_format.c b/src/gallium/drivers/nouveau/nv30/nv30_format.c index 86620b4..67e0d5e 100644 --- a/src/gallium/drivers/nv30/nv30_format.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_format.c @@ -23,9 +23,9 @@ * */ -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_format.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_format.h" #define NV30_3D_RT_FORMAT_COLOR_X1R5G5B5 2 diff --git a/src/gallium/drivers/nv30/nv30_format.h b/src/gallium/drivers/nouveau/nv30/nv30_format.h index 8bf4a37..8bf4a37 100644 --- a/src/gallium/drivers/nv30/nv30_format.h +++ b/src/gallium/drivers/nouveau/nv30/nv30_format.h diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c index ae87ad7..e8acdfe 100644 --- a/src/gallium/drivers/nv30/nv30_fragprog.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c @@ -25,10 +25,10 @@ #include "tgsi/tgsi_parse.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nvfx_shader.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nvfx_shader.h" static void nv30_fragprog_upload(struct nv30_context *nv30) diff --git a/src/gallium/drivers/nv30/nv30_fragtex.c b/src/gallium/drivers/nouveau/nv30/nv30_fragtex.c index 1d22cc3..60ffb03 100644 --- a/src/gallium/drivers/nv30/nv30_fragtex.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_fragtex.c @@ -25,10 +25,10 @@ #include "util/u_inlines.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_format.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_format.h" void nv30_fragtex_validate(struct nv30_context *nv30) diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nouveau/nv30/nv30_miptree.c index c038d70..4c237f6 100644 --- a/src/gallium/drivers/nv30/nv30_miptree.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_miptree.c @@ -27,11 +27,11 @@ #include "util/u_inlines.h" #include "util/u_surface.h" -#include "nouveau/nv_m2mf.xml.h" -#include "nv30_screen.h" -#include "nv30_context.h" -#include "nv30_resource.h" -#include "nv30_transfer.h" +#include "nv_m2mf.xml.h" +#include "nv30/nv30_screen.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_resource.h" +#include "nv30/nv30_transfer.h" static INLINE unsigned layer_offset(struct pipe_resource *pt, unsigned level, unsigned layer) diff --git a/src/gallium/drivers/nv30/nv30_push.c b/src/gallium/drivers/nouveau/nv30/nv30_push.c index d37af2c..e0734fa 100644 --- a/src/gallium/drivers/nv30/nv30_push.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_push.c @@ -29,10 +29,10 @@ #include "util/u_format.h" #include "translate/translate.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_resource.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_resource.h" struct push_context { struct nouveau_pushbuf *push; diff --git a/src/gallium/drivers/nv30/nv30_query.c b/src/gallium/drivers/nouveau/nv30/nv30_query.c index a0a4c67..01b3817 100644 --- a/src/gallium/drivers/nv30/nv30_query.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_query.c @@ -23,10 +23,10 @@ * */ -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_screen.h" -#include "nv30_context.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_screen.h" +#include "nv30/nv30_context.h" #define LIST_FIRST_ENTRY(__type, __item, __field) \ LIST_ENTRY(__type, (__item)->next, __field) diff --git a/src/gallium/drivers/nv30/nv30_resource.c b/src/gallium/drivers/nouveau/nv30/nv30_resource.c index 64a437a..c99db1c 100644 --- a/src/gallium/drivers/nv30/nv30_resource.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_resource.c @@ -26,10 +26,10 @@ #include "util/u_format.h" #include "util/u_inlines.h" -#include "nv30_screen.h" -#include "nv30_context.h" -#include "nv30_resource.h" -#include "nv30_transfer.h" +#include "nv30/nv30_screen.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_resource.h" +#include "nv30/nv30_transfer.h" static struct pipe_resource * nv30_resource_create(struct pipe_screen *pscreen, diff --git a/src/gallium/drivers/nv30/nv30_resource.h b/src/gallium/drivers/nouveau/nv30/nv30_resource.h index fdf62c7..aff4196 100644 --- a/src/gallium/drivers/nv30/nv30_resource.h +++ b/src/gallium/drivers/nouveau/nv30/nv30_resource.h @@ -1,7 +1,7 @@ #ifndef __NV30_RESOURCE_H__ #define __NV30_RESOURCE_H__ -#include "nouveau/nouveau_buffer.h" +#include "nouveau_buffer.h" void nv30_resource_screen_init(struct pipe_screen *); void nv30_resource_init(struct pipe_context *); diff --git a/src/gallium/drivers/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c index 39e64ce..50ddfec 100644 --- a/src/gallium/drivers/nv30/nv30_screen.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -26,16 +26,16 @@ #include "util/u_format.h" #include "util/u_format_s3tc.h" -#include "nouveau/nv_object.xml.h" -#include "nouveau/nv_m2mf.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv01_2d.xml.h" - -#include "nouveau/nouveau_fence.h" -#include "nv30_screen.h" -#include "nv30_context.h" -#include "nv30_resource.h" -#include "nv30_format.h" +#include "nv_object.xml.h" +#include "nv_m2mf.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv01_2d.xml.h" + +#include "nouveau_fence.h" +#include "nv30/nv30_screen.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_resource.h" +#include "nv30/nv30_format.h" #define RANKINE_0397_CHIPSET 0x00000003 #define RANKINE_0497_CHIPSET 0x000001e0 diff --git a/src/gallium/drivers/nv30/nv30_screen.h b/src/gallium/drivers/nouveau/nv30/nv30_screen.h index 2ee087e..c4c3aae 100644 --- a/src/gallium/drivers/nv30/nv30_screen.h +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.h @@ -8,11 +8,11 @@ #include "util/u_double_list.h" -#include "nouveau/nouveau_screen.h" -#include "nouveau/nouveau_fence.h" -#include "nouveau/nouveau_heap.h" -#include "nv30_winsys.h" -#include "nv30_resource.h" +#include "nouveau_screen.h" +#include "nouveau_fence.h" +#include "nouveau_heap.h" +#include "nv30/nv30_winsys.h" +#include "nv30/nv30_resource.h" struct nv30_context; diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nouveau/nv30/nv30_state.c index 55f2b8c..64be1b7 100644 --- a/src/gallium/drivers/nv30/nv30_state.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_state.c @@ -26,11 +26,11 @@ #include "util/u_helpers.h" #include "util/u_inlines.h" -#include "nouveau/nouveau_gldefs.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_winsys.h" +#include "nouveau_gldefs.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_winsys.h" #define NV40_3D_MRT_BLEND_ENABLE 0x0000036c diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nouveau/nv30/nv30_state.h index e27e16f..e27e16f 100644 --- a/src/gallium/drivers/nv30/nv30_state.h +++ b/src/gallium/drivers/nouveau/nv30/nv30_state.h diff --git a/src/gallium/drivers/nv30/nv30_state_validate.c b/src/gallium/drivers/nouveau/nv30/nv30_state_validate.c index 99a9879..f227559 100644 --- a/src/gallium/drivers/nv30/nv30_state_validate.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_state_validate.c @@ -27,10 +27,10 @@ #include "util/u_math.h" #include "util/u_half.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_format.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_format.h" static void nv30_validate_fb(struct nv30_context *nv30) diff --git a/src/gallium/drivers/nv30/nv30_texture.c b/src/gallium/drivers/nouveau/nv30/nv30_texture.c index 094cff7..d3cffcf 100644 --- a/src/gallium/drivers/nv30/nv30_texture.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_texture.c @@ -26,10 +26,10 @@ #include "util/u_inlines.h" #include "util/u_format.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_format.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_format.h" #define NV30_3D_TEX_WRAP_S_MIRROR_REPEAT NV30_3D_TEX_WRAP_S_MIRRORED_REPEAT #define NV30_WRAP(n) \ diff --git a/src/gallium/drivers/nv30/nv30_transfer.c b/src/gallium/drivers/nouveau/nv30/nv30_transfer.c index 37df721..99bc099 100644 --- a/src/gallium/drivers/nv30/nv30_transfer.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_transfer.c @@ -29,13 +29,13 @@ #include "util/u_math.h" -#include "nouveau/nv_object.xml.h" -#include "nouveau/nv_m2mf.xml.h" -#include "nv01_2d.xml.h" -#include "nv30-40_3d.xml.h" +#include "nv_object.xml.h" +#include "nv_m2mf.xml.h" +#include "nv30/nv01_2d.xml.h" +#include "nv30/nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_transfer.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_transfer.h" /* Various helper functions to transfer different types of data in a number * of different ways. diff --git a/src/gallium/drivers/nv30/nv30_transfer.h b/src/gallium/drivers/nouveau/nv30/nv30_transfer.h index 3fa6cd0..3fa6cd0 100644 --- a/src/gallium/drivers/nv30/nv30_transfer.h +++ b/src/gallium/drivers/nouveau/nv30/nv30_transfer.h diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nouveau/nv30/nv30_vbo.c index 9f00c02..d9b3c3e 100644 --- a/src/gallium/drivers/nv30/nv30_vbo.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_vbo.c @@ -27,11 +27,11 @@ #include "util/u_inlines.h" #include "translate/translate.h" -#include "nouveau/nouveau_fence.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_format.h" +#include "nouveau_fence.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_format.h" static void nv30_emit_vtxattr(struct nv30_context *nv30, struct pipe_vertex_buffer *vb, diff --git a/src/gallium/drivers/nv30/nv30_vertprog.c b/src/gallium/drivers/nouveau/nv30/nv30_vertprog.c index 79323d9..7bf05dd 100644 --- a/src/gallium/drivers/nv30/nv30_vertprog.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_vertprog.c @@ -26,10 +26,10 @@ #include "util/u_dynarray.h" #include "tgsi/tgsi_parse.h" -#include "nouveau/nv_object.xml.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_state.h" +#include "nv_object.xml.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_state.h" static void nv30_vertprog_destroy(struct nv30_vertprog *vp) diff --git a/src/gallium/drivers/nv30/nv30_vertprog.h b/src/gallium/drivers/nouveau/nv30/nv30_vertprog.h index e8c16b0..5556e0c 100644 --- a/src/gallium/drivers/nv30/nv30_vertprog.h +++ b/src/gallium/drivers/nouveau/nv30/nv30_vertprog.h @@ -171,6 +171,6 @@ #define NV30_VP_SRC_REG_TYPE_INPUT 2 #define NV30_VP_SRC_REG_TYPE_CONST 3 /* guess */ -#include "nvfx_shader.h" +#include "nv30/nvfx_shader.h" #endif diff --git a/src/gallium/drivers/nv30/nv30_winsys.h b/src/gallium/drivers/nouveau/nv30/nv30_winsys.h index 1db634e..5cee5df 100644 --- a/src/gallium/drivers/nv30/nv30_winsys.h +++ b/src/gallium/drivers/nouveau/nv30/nv30_winsys.h @@ -2,8 +2,8 @@ #define __NV30_WINSYS_H__ #include <string.h> -#include "nouveau/nouveau_winsys.h" -#include "nouveau/nouveau_buffer.h" +#include "nouveau_winsys.h" +#include "nouveau_buffer.h" /*XXX: rnn */ #define NV40_3D_VTXTEX_OFFSET(i) (0x0900 + ((i) * 0x20)) // 401e80 diff --git a/src/gallium/drivers/nv30/nv40_vertprog.h b/src/gallium/drivers/nouveau/nv30/nv40_vertprog.h index c1f2208..b369ced 100644 --- a/src/gallium/drivers/nv30/nv40_vertprog.h +++ b/src/gallium/drivers/nouveau/nv30/nv40_vertprog.h @@ -173,6 +173,6 @@ # define NV40_VP_SRC_REG_TYPE_INPUT 2 # define NV40_VP_SRC_REG_TYPE_CONST 3 -#include "nvfx_shader.h" +#include "nv30/nvfx_shader.h" #endif diff --git a/src/gallium/drivers/nv30/nv40_verttex.c b/src/gallium/drivers/nouveau/nv30/nv40_verttex.c index 4ff2278..9a7163c 100644 --- a/src/gallium/drivers/nv30/nv40_verttex.c +++ b/src/gallium/drivers/nouveau/nv30/nv40_verttex.c @@ -24,7 +24,7 @@ */ #include "util/u_inlines.h" -#include "nv30_context.h" +#include "nv30/nv30_context.h" void nv40_verttex_validate(struct nv30_context *nv30) diff --git a/src/gallium/drivers/nv30/nvfx_fragprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c index a734330..4751ec8 100644 --- a/src/gallium/drivers/nv30/nvfx_fragprog.c +++ b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c @@ -12,9 +12,9 @@ #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_ureg.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nvfx_shader.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nvfx_shader.h" struct nvfx_fpc { struct nv30_fragprog *fp; diff --git a/src/gallium/drivers/nv30/nvfx_shader.h b/src/gallium/drivers/nouveau/nv30/nvfx_shader.h index 987e1b0..987e1b0 100644 --- a/src/gallium/drivers/nv30/nvfx_shader.h +++ b/src/gallium/drivers/nouveau/nv30/nvfx_shader.h diff --git a/src/gallium/drivers/nv30/nvfx_vertprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c index b73d418..3ae51ef 100644 --- a/src/gallium/drivers/nv30/nvfx_vertprog.c +++ b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c @@ -12,9 +12,9 @@ #include "draw/draw_context.h" -#include "nv30-40_3d.xml.h" -#include "nv30_context.h" -#include "nv30_resource.h" +#include "nv30/nv30-40_3d.xml.h" +#include "nv30/nv30_context.h" +#include "nv30/nv30_resource.h" /* TODO (at least...): * 1. Indexed consts + ARL @@ -27,8 +27,8 @@ * 4. bugs */ -#include "nv30_vertprog.h" -#include "nv40_vertprog.h" +#include "nv30/nv30_vertprog.h" +#include "nv30/nv40_vertprog.h" struct nvfx_loop_entry { unsigned brk_target; diff --git a/src/gallium/drivers/nv50/nv50_2d.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h index dfbef2c..dfbef2c 100644 --- a/src/gallium/drivers/nv50/nv50_2d.xml.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h diff --git a/src/gallium/drivers/nv50/nv50_3d.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_3d.xml.h index 9dff8b2..9dff8b2 100644 --- a/src/gallium/drivers/nv50/nv50_3d.xml.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_3d.xml.h diff --git a/src/gallium/drivers/nv50/nv50_3ddefs.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_3ddefs.xml.h index f26ac45..f26ac45 100644 --- a/src/gallium/drivers/nv50/nv50_3ddefs.xml.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_3ddefs.xml.h diff --git a/src/gallium/drivers/nv50/nv50_blit.h b/src/gallium/drivers/nouveau/nv50/nv50_blit.h index bdd6a63..bdd6a63 100644 --- a/src/gallium/drivers/nv50/nv50_blit.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_blit.h diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nouveau/nv50/nv50_context.c index d9de443..b6bdf79 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_context.c @@ -27,9 +27,9 @@ #include "draw/draw_context.h" #endif -#include "nv50_context.h" -#include "nv50_screen.h" -#include "nv50_resource.h" +#include "nv50/nv50_context.h" +#include "nv50/nv50_screen.h" +#include "nv50/nv50_resource.h" static void nv50_flush(struct pipe_context *pipe, diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nouveau/nv50/nv50_context.h index ed4ef24..ee6eb0e 100644 --- a/src/gallium/drivers/nv50/nv50_context.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_context.h @@ -14,20 +14,20 @@ #include "draw/draw_vertex.h" #endif -#include "nv50_debug.h" -#include "nv50_winsys.h" -#include "nv50_stateobj.h" -#include "nv50_screen.h" -#include "nv50_program.h" -#include "nv50_resource.h" -#include "nv50_transfer.h" - -#include "nouveau/nouveau_context.h" -#include "nouveau/nv_object.xml.h" -#include "nouveau/nv_m2mf.xml.h" -#include "nv50_3ddefs.xml.h" -#include "nv50_3d.xml.h" -#include "nv50_2d.xml.h" +#include "nv50/nv50_debug.h" +#include "nv50/nv50_winsys.h" +#include "nv50/nv50_stateobj.h" +#include "nv50/nv50_screen.h" +#include "nv50/nv50_program.h" +#include "nv50/nv50_resource.h" +#include "nv50/nv50_transfer.h" + +#include "nouveau_context.h" +#include "nv_object.xml.h" +#include "nv_m2mf.xml.h" +#include "nv50/nv50_3ddefs.xml.h" +#include "nv50/nv50_3d.xml.h" +#include "nv50/nv50_2d.xml.h" #define NV50_NEW_BLEND (1 << 0) #define NV50_NEW_RASTERIZER (1 << 1) diff --git a/src/gallium/drivers/nv50/nv50_debug.h b/src/gallium/drivers/nouveau/nv50/nv50_debug.h index f3dee62..f3dee62 100644 --- a/src/gallium/drivers/nv50/nv50_debug.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_debug.h diff --git a/src/gallium/drivers/nv50/nv50_defs.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_defs.xml.h index 2e42843..2e42843 100644 --- a/src/gallium/drivers/nv50/nv50_defs.xml.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_defs.xml.h diff --git a/src/gallium/drivers/nv50/nv50_draw.c b/src/gallium/drivers/nouveau/nv50/nv50_draw.c index 58c2899..fa68cd8 100644 --- a/src/gallium/drivers/nv50/nv50_draw.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_draw.c @@ -22,7 +22,7 @@ #include "draw/draw_pipe.h" -#include "nv50_context.h" +#include "nv50/nv50_context.h" struct nv50_render_stage { struct draw_stage stage; diff --git a/src/gallium/drivers/nv50/nv50_formats.c b/src/gallium/drivers/nouveau/nv50/nv50_formats.c index 4893e8e..0a7e812 100644 --- a/src/gallium/drivers/nv50/nv50_formats.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_formats.c @@ -21,14 +21,14 @@ */ #if NOUVEAU_DRIVER == 0xc0 -# include "nvc0_screen.h" -# include "nvc0_3d.xml.h" +# include "nvc0/nvc0_screen.h" +# include "nvc0/nvc0_3d.xml.h" #else -# include "nv50_screen.h" -# include "nv50_3d.xml.h" +# include "nv50/nv50_screen.h" +# include "nv50/nv50_3d.xml.h" #endif -#include "nv50_texture.xml.h" -#include "nv50_defs.xml.h" +#include "nv50/nv50_texture.xml.h" +#include "nv50/nv50_defs.xml.h" #include "pipe/p_defines.h" diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c index 03c34c1..513d8f9 100644 --- a/src/gallium/drivers/nv50/nv50_miptree.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c @@ -25,8 +25,8 @@ #include "util/u_inlines.h" #include "util/u_format.h" -#include "nv50_context.h" -#include "nv50_resource.h" +#include "nv50/nv50_context.h" +#include "nv50/nv50_resource.h" uint32_t nv50_tex_choose_tile_dims_helper(unsigned nx, unsigned ny, unsigned nz) diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nouveau/nv50/nv50_program.c index 535bfad..73df71c 100644 --- a/src/gallium/drivers/nv50/nv50_program.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_program.c @@ -20,8 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_program.h" -#include "nv50_context.h" +#include "nv50/nv50_program.h" +#include "nv50/nv50_context.h" #include "codegen/nv50_ir_driver.h" diff --git a/src/gallium/drivers/nv50/nv50_program.h b/src/gallium/drivers/nouveau/nv50/nv50_program.h index 13b9516..13b9516 100644 --- a/src/gallium/drivers/nv50/nv50_program.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_program.h diff --git a/src/gallium/drivers/nv50/nv50_push.c b/src/gallium/drivers/nouveau/nv50/nv50_push.c index 7380432..3e9a409 100644 --- a/src/gallium/drivers/nv50/nv50_push.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_push.c @@ -5,10 +5,10 @@ #include "util/u_format.h" #include "translate/translate.h" -#include "nv50_context.h" -#include "nv50_resource.h" +#include "nv50/nv50_context.h" +#include "nv50/nv50_resource.h" -#include "nv50_3d.xml.h" +#include "nv50/nv50_3d.xml.h" struct push_context { struct nouveau_pushbuf *push; diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nouveau/nv50/nv50_query.c index 34456a9..6f25a08 100644 --- a/src/gallium/drivers/nv50/nv50_query.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_query.c @@ -24,8 +24,8 @@ #define NV50_PUSH_EXPLICIT_SPACE_CHECKING -#include "nv50_context.h" -#include "nouveau/nv_object.xml.h" +#include "nv50/nv50_context.h" +#include "nv_object.xml.h" /* XXX: Nested queries, and simultaneous queries on multiple gallium contexts * (since we use only a single GPU channel per screen) will not work properly. diff --git a/src/gallium/drivers/nv50/nv50_resource.c b/src/gallium/drivers/nouveau/nv50/nv50_resource.c index 43c6998..7fbb0a9 100644 --- a/src/gallium/drivers/nv50/nv50_resource.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_resource.c @@ -3,9 +3,9 @@ #include "util/u_inlines.h" #include "util/u_format.h" -#include "nouveau/nouveau_screen.h" +#include "nouveau_screen.h" -#include "nv50_resource.h" +#include "nv50/nv50_resource.h" static struct pipe_resource * nv50_resource_create(struct pipe_screen *screen, diff --git a/src/gallium/drivers/nv50/nv50_resource.h b/src/gallium/drivers/nouveau/nv50/nv50_resource.h index b104404..c06daa3 100644 --- a/src/gallium/drivers/nv50/nv50_resource.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_resource.h @@ -5,8 +5,8 @@ #include "util/u_transfer.h" #include "util/u_double_list.h" -#include "nouveau/nouveau_winsys.h" -#include "nouveau/nouveau_buffer.h" +#include "nouveau_winsys.h" +#include "nouveau_buffer.h" #ifndef __NVC0_RESOURCE_H__ /* make sure we don't use these in nvc0: */ diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index 1f52594..f454ec7 100644 --- a/src/gallium/drivers/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -24,12 +24,12 @@ #include "util/u_format_s3tc.h" #include "pipe/p_screen.h" -#include "nv50_context.h" -#include "nv50_screen.h" +#include "nv50/nv50_context.h" +#include "nv50/nv50_screen.h" -#include "nouveau/nouveau_vp3_video.h" +#include "nouveau_vp3_video.h" -#include "nouveau/nv_object.xml.h" +#include "nv_object.xml.h" #include <errno.h> #ifndef NOUVEAU_GETPARAM_GRAPH_UNITS @@ -211,7 +211,7 @@ nv50_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, default: return 0; } - + switch (param) { case PIPE_SHADER_CAP_MAX_INSTRUCTIONS: case PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS: diff --git a/src/gallium/drivers/nv50/nv50_screen.h b/src/gallium/drivers/nouveau/nv50/nv50_screen.h index 2e8af43..091a392 100644 --- a/src/gallium/drivers/nv50/nv50_screen.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.h @@ -1,13 +1,13 @@ #ifndef __NV50_SCREEN_H__ #define __NV50_SCREEN_H__ -#include "nouveau/nouveau_screen.h" -#include "nouveau/nouveau_fence.h" -#include "nouveau/nouveau_mm.h" -#include "nouveau/nouveau_heap.h" +#include "nouveau_screen.h" +#include "nouveau_fence.h" +#include "nouveau_mm.h" +#include "nouveau_heap.h" -#include "nv50_winsys.h" -#include "nv50_stateobj.h" +#include "nv50/nv50_winsys.h" +#include "nv50/nv50_stateobj.h" #define NV50_TIC_MAX_ENTRIES 2048 #define NV50_TSC_MAX_ENTRIES 2048 @@ -50,7 +50,7 @@ struct nv50_screen { int next; uint32_t lock[NV50_TIC_MAX_ENTRIES / 32]; } tic; - + struct { void **entries; int next; diff --git a/src/gallium/drivers/nv50/nv50_shader_state.c b/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c index 770f884..9144fc4 100644 --- a/src/gallium/drivers/nv50/nv50_shader_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c @@ -26,7 +26,7 @@ #include "pipe/p_state.h" #include "util/u_inlines.h" -#include "nv50_context.h" +#include "nv50/nv50_context.h" void nv50_constbufs_validate(struct nv50_context *nv50) diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c index 2454a3d..7dceb51 100644 --- a/src/gallium/drivers/nv50/nv50_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c @@ -28,13 +28,13 @@ #include "tgsi/tgsi_parse.h" -#include "nv50_stateobj.h" -#include "nv50_context.h" +#include "nv50/nv50_stateobj.h" +#include "nv50/nv50_context.h" -#include "nv50_3d.xml.h" -#include "nv50_texture.xml.h" +#include "nv50/nv50_3d.xml.h" +#include "nv50/nv50_texture.xml.h" -#include "nouveau/nouveau_gldefs.h" +#include "nouveau_gldefs.h" /* Caveats: * ! pipe_sampler_state.normalized_coords is ignored - rectangle textures will @@ -238,7 +238,7 @@ nv50_rasterizer_state_create(struct pipe_context *pipe, SB_BEGIN_3D(so, SCISSOR_ENABLE(0), 1); SB_DATA (so, cso->scissor); #endif - + SB_BEGIN_3D(so, SHADE_MODEL, 1); SB_DATA (so, cso->flatshade ? NV50_3D_SHADE_MODEL_FLAT : NV50_3D_SHADE_MODEL_SMOOTH); @@ -399,7 +399,7 @@ nv50_zsa_state_create(struct pipe_context *pipe, SB_BEGIN_3D(so, STENCIL_TWO_SIDE_ENABLE, 1); SB_DATA (so, 0); } - + SB_BEGIN_3D(so, ALPHA_TEST_ENABLE, 1); if (cso->alpha.enabled) { SB_DATA (so, 1); @@ -1076,7 +1076,7 @@ nv50_init_state_functions(struct nv50_context *nv50) pipe->set_vertex_sampler_views = nv50_vp_set_sampler_views; pipe->set_fragment_sampler_views = nv50_fp_set_sampler_views; pipe->set_geometry_sampler_views = nv50_gp_set_sampler_views; - + pipe->create_vs_state = nv50_vp_state_create; pipe->create_fs_state = nv50_fp_state_create; pipe->create_gs_state = nv50_gp_state_create; diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c index f5e7b36..866829c 100644 --- a/src/gallium/drivers/nv50/nv50_state_validate.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c @@ -1,5 +1,5 @@ -#include "nv50_context.h" +#include "nv50/nv50_context.h" #include "os/os_time.h" static void diff --git a/src/gallium/drivers/nv50/nv50_stateobj.h b/src/gallium/drivers/nouveau/nv50/nv50_stateobj.h index 37b9967..2389517 100644 --- a/src/gallium/drivers/nv50/nv50_stateobj.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_stateobj.h @@ -14,7 +14,7 @@ #define SB_DATA(so, u) (so)->state[(so)->size++] = (u) -#include "nv50_stateobj_tex.h" +#include "nv50/nv50_stateobj_tex.h" struct nv50_blend_stateobj { struct pipe_blend_state pipe; diff --git a/src/gallium/drivers/nv50/nv50_stateobj_tex.h b/src/gallium/drivers/nouveau/nv50/nv50_stateobj_tex.h index 99548cb..99548cb 100644 --- a/src/gallium/drivers/nv50/nv50_stateobj_tex.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_stateobj_tex.h diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c index 30dab0b..dcc1fce 100644 --- a/src/gallium/drivers/nv50/nv50_surface.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c @@ -33,11 +33,11 @@ #include "os/os_thread.h" -#include "nv50_context.h" -#include "nv50_resource.h" +#include "nv50/nv50_context.h" +#include "nv50/nv50_resource.h" -#include "nv50_defs.xml.h" -#include "nv50_texture.xml.h" +#include "nv50/nv50_defs.xml.h" +#include "nv50/nv50_texture.xml.h" /* these are used in nv50_blit.h */ #define NV50_ENG2D_SUPPORTED_FORMATS 0xff0843e080608409ULL @@ -47,7 +47,7 @@ #define NV50_ENG2D_OPERATION_FORMATS 0x060001c000608000ULL #define NOUVEAU_DRIVER 0x50 -#include "nv50_blit.h" +#include "nv50/nv50_blit.h" static INLINE uint8_t nv50_2d_format(enum pipe_format format, boolean dst, boolean dst_src_equal) @@ -1351,5 +1351,3 @@ nv50_init_surface_functions(struct nv50_context *nv50) pipe->clear_render_target = nv50_clear_render_target; pipe->clear_depth_stencil = nv50_clear_depth_stencil; } - - diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nouveau/nv50/nv50_tex.c index 48b35d7..9e51292 100644 --- a/src/gallium/drivers/nv50/nv50_tex.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_tex.c @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_context.h" -#include "nv50_resource.h" -#include "nv50_texture.xml.h" -#include "nv50_defs.xml.h" +#include "nv50/nv50_context.h" +#include "nv50/nv50_resource.h" +#include "nv50/nv50_texture.xml.h" +#include "nv50/nv50_defs.xml.h" #include "util/u_format.h" diff --git a/src/gallium/drivers/nv50/nv50_texture.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_texture.xml.h index 31eab9b..31eab9b 100644 --- a/src/gallium/drivers/nv50/nv50_texture.xml.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_texture.xml.h diff --git a/src/gallium/drivers/nv50/nv50_transfer.c b/src/gallium/drivers/nouveau/nv50/nv50_transfer.c index 25319d7..a990682 100644 --- a/src/gallium/drivers/nv50/nv50_transfer.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_transfer.c @@ -1,9 +1,9 @@ #include "util/u_format.h" -#include "nv50_context.h" +#include "nv50/nv50_context.h" -#include "nv50_defs.xml.h" +#include "nv50/nv50_defs.xml.h" struct nv50_transfer { struct pipe_transfer base; diff --git a/src/gallium/drivers/nv50/nv50_transfer.h b/src/gallium/drivers/nouveau/nv50/nv50_transfer.h index c58cb00..c58cb00 100644 --- a/src/gallium/drivers/nv50/nv50_transfer.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_transfer.h diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c index ca46f6c..c6162b5 100644 --- a/src/gallium/drivers/nv50/nv50_vbo.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c @@ -26,10 +26,10 @@ #include "util/u_format.h" #include "translate/translate.h" -#include "nv50_context.h" -#include "nv50_resource.h" +#include "nv50/nv50_context.h" +#include "nv50/nv50_resource.h" -#include "nv50_3d.xml.h" +#include "nv50/nv50_3d.xml.h" void nv50_vertex_state_delete(struct pipe_context *pipe, diff --git a/src/gallium/drivers/nv50/nv50_winsys.h b/src/gallium/drivers/nouveau/nv50/nv50_winsys.h index 145ee70..e8578c8 100644 --- a/src/gallium/drivers/nv50/nv50_winsys.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_winsys.h @@ -7,8 +7,8 @@ #include "pipe/p_defines.h" -#include "nouveau/nouveau_winsys.h" -#include "nouveau/nouveau_buffer.h" +#include "nouveau_winsys.h" +#include "nouveau_buffer.h" #ifndef NV04_PFIFO_MAX_PACKET_LEN diff --git a/src/gallium/drivers/nv50/nv84_video.c b/src/gallium/drivers/nouveau/nv50/nv84_video.c index 0627bab..3fee6d9 100644 --- a/src/gallium/drivers/nv50/nv84_video.c +++ b/src/gallium/drivers/nouveau/nv50/nv84_video.c @@ -29,7 +29,7 @@ #include "util/u_sampler.h" #include "vl/vl_zscan.h" -#include "nv84_video.h" +#include "nv50/nv84_video.h" static int nv84_copy_firmware(const char *path, void *dest, ssize_t len) diff --git a/src/gallium/drivers/nv50/nv84_video.h b/src/gallium/drivers/nouveau/nv50/nv84_video.h index b43fe96..2edba38 100644 --- a/src/gallium/drivers/nv50/nv84_video.h +++ b/src/gallium/drivers/nouveau/nv50/nv84_video.h @@ -31,7 +31,7 @@ #include "util/u_video.h" -#include "nv50_context.h" +#include "nv50/nv50_context.h" /* These are expected to be on their own pushbufs */ #define SUBC_BSP(m) 2, (m) diff --git a/src/gallium/drivers/nv50/nv84_video_bsp.c b/src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c index 28ba90f..86047b5 100644 --- a/src/gallium/drivers/nv50/nv84_video_bsp.c +++ b/src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv84_video.h" +#include "nv50/nv84_video.h" struct iparm { struct iseqparm { diff --git a/src/gallium/drivers/nv50/nv84_video_vp.c b/src/gallium/drivers/nouveau/nv50/nv84_video_vp.c index 581361b..619aa4e 100644 --- a/src/gallium/drivers/nv50/nv84_video_vp.c +++ b/src/gallium/drivers/nouveau/nv50/nv84_video_vp.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv84_video.h" +#include "nv50/nv84_video.h" #include "util/u_sse.h" diff --git a/src/gallium/drivers/nv50/nv98_video.c b/src/gallium/drivers/nouveau/nv50/nv98_video.c index 8a13044..069481d 100644 --- a/src/gallium/drivers/nv50/nv98_video.c +++ b/src/gallium/drivers/nouveau/nv50/nv98_video.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv98_video.h" +#include "nv50/nv98_video.h" #include "util/u_sampler.h" #include "util/u_format.h" diff --git a/src/gallium/drivers/nv50/nv98_video.h b/src/gallium/drivers/nouveau/nv50/nv98_video.h index ea2a3ef..cec761d 100644 --- a/src/gallium/drivers/nv50/nv98_video.h +++ b/src/gallium/drivers/nouveau/nv50/nv98_video.h @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50_context.h" -#include "nv50_screen.h" -#include "nouveau/nouveau_vp3_video.h" +#include "nv50/nv50_context.h" +#include "nv50/nv50_screen.h" +#include "nouveau_vp3_video.h" #include "vl/vl_decoder.h" #include "vl/vl_types.h" diff --git a/src/gallium/drivers/nv50/nv98_video_bsp.c b/src/gallium/drivers/nouveau/nv50/nv98_video_bsp.c index 9a5639e..97d4119 100644 --- a/src/gallium/drivers/nv50/nv98_video_bsp.c +++ b/src/gallium/drivers/nouveau/nv50/nv98_video_bsp.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv98_video.h" +#include "nv50/nv98_video.h" #if NOUVEAU_VP3_DEBUG_FENCE static void dump_comm_bsp(struct comm *comm) diff --git a/src/gallium/drivers/nv50/nv98_video_ppp.c b/src/gallium/drivers/nouveau/nv50/nv98_video_ppp.c index a26c661..6b0b714 100644 --- a/src/gallium/drivers/nv50/nv98_video_ppp.c +++ b/src/gallium/drivers/nouveau/nv50/nv98_video_ppp.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv98_video.h" +#include "nv50/nv98_video.h" static void nv98_decoder_setup_ppp(struct nouveau_vp3_decoder *dec, struct nouveau_vp3_video_buffer *target, uint32_t low700) { diff --git a/src/gallium/drivers/nv50/nv98_video_vp.c b/src/gallium/drivers/nouveau/nv50/nv98_video_vp.c index 4fbce69..9b756ea 100644 --- a/src/gallium/drivers/nv50/nv98_video_vp.c +++ b/src/gallium/drivers/nouveau/nv50/nv98_video_vp.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv98_video.h" +#include "nv50/nv98_video.h" #include <sys/mman.h> #if NOUVEAU_VP3_DEBUG_FENCE diff --git a/src/gallium/drivers/nvc0/nvc0_2d.xml.h b/src/gallium/drivers/nouveau/nvc0/nvc0_2d.xml.h index 9a488c1..9a488c1 100644 --- a/src/gallium/drivers/nvc0/nvc0_2d.xml.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_2d.xml.h diff --git a/src/gallium/drivers/nvc0/nvc0_3d.xml.h b/src/gallium/drivers/nouveau/nvc0/nvc0_3d.xml.h index d3f719d..d3f719d 100644 --- a/src/gallium/drivers/nvc0/nvc0_3d.xml.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_3d.xml.h diff --git a/src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h b/src/gallium/drivers/nouveau/nvc0/nvc0_3ddefs.xml.h index 84b1522..84b1522 100644 --- a/src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_3ddefs.xml.h diff --git a/src/gallium/drivers/nvc0/nvc0_compute.c b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c index 464b72f..b49f1ae 100644 --- a/src/gallium/drivers/nvc0/nvc0_compute.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c @@ -22,8 +22,8 @@ * Authors: Christoph Bumiller, Samuel Pitoiset */ -#include "nvc0_context.h" -#include "nvc0_compute.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_compute.h" int nvc0_screen_compute_setup(struct nvc0_screen *screen, diff --git a/src/gallium/drivers/nvc0/nvc0_compute.h b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.h index f2df7be..9a1a717 100644 --- a/src/gallium/drivers/nvc0/nvc0_compute.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.h @@ -2,7 +2,7 @@ #define NVC0_COMPUTE_H #include "nv50/nv50_defs.xml.h" -#include "nvc0_compute.xml.h" +#include "nvc0/nvc0_compute.xml.h" boolean nvc0_compute_validate_program(struct nvc0_context *nvc0); diff --git a/src/gallium/drivers/nvc0/nvc0_compute.xml.h b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.xml.h index 35e6bfd..35e6bfd 100644 --- a/src/gallium/drivers/nvc0/nvc0_compute.xml.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.xml.h diff --git a/src/gallium/drivers/nvc0/nvc0_context.c b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c index f7cfe59..e0c2b74 100644 --- a/src/gallium/drivers/nvc0/nvc0_context.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c @@ -27,9 +27,9 @@ #include "draw/draw_context.h" #endif -#include "nvc0_context.h" -#include "nvc0_screen.h" -#include "nvc0_resource.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_screen.h" +#include "nvc0/nvc0_resource.h" static void nvc0_flush(struct pipe_context *pipe, diff --git a/src/gallium/drivers/nvc0/nvc0_context.h b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h index 0baf811..3fbecdc 100644 --- a/src/gallium/drivers/nvc0/nvc0_context.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h @@ -15,21 +15,21 @@ #endif #include "nv50/nv50_debug.h" -#include "nvc0_winsys.h" -#include "nvc0_stateobj.h" -#include "nvc0_screen.h" -#include "nvc0_program.h" -#include "nvc0_resource.h" +#include "nvc0/nvc0_winsys.h" +#include "nvc0/nvc0_stateobj.h" +#include "nvc0/nvc0_screen.h" +#include "nvc0/nvc0_program.h" +#include "nvc0/nvc0_resource.h" #include "nv50/nv50_transfer.h" -#include "nouveau/nouveau_context.h" +#include "nouveau_context.h" -#include "nvc0_3ddefs.xml.h" -#include "nvc0_3d.xml.h" -#include "nvc0_2d.xml.h" -#include "nvc0_m2mf.xml.h" -#include "nve4_p2mf.xml.h" +#include "nvc0/nvc0_3ddefs.xml.h" +#include "nvc0/nvc0_3d.xml.h" +#include "nvc0/nvc0_2d.xml.h" +#include "nvc0/nvc0_m2mf.xml.h" +#include "nvc0/nve4_p2mf.xml.h" /* NOTE: must keep NVC0_NEW_...PROG in consecutive bits in this order */ #define NVC0_NEW_BLEND (1 << 0) diff --git a/src/gallium/drivers/nvc0/nvc0_draw.c b/src/gallium/drivers/nouveau/nvc0/nvc0_draw.c index f826d37..e261d50 100644 --- a/src/gallium/drivers/nvc0/nvc0_draw.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_draw.c @@ -22,7 +22,7 @@ #include "draw/draw_pipe.h" -#include "nvc0_context.h" +#include "nvc0/nvc0_context.h" struct nvc0_render_stage { struct draw_stage stage; diff --git a/src/gallium/drivers/nvc0/nvc0_formats.c b/src/gallium/drivers/nouveau/nvc0/nvc0_formats.c index 2bfdb0e..2bfdb0e 100644 --- a/src/gallium/drivers/nvc0/nvc0_formats.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_formats.c diff --git a/src/gallium/drivers/nvc0/nvc0_graph_macros.h b/src/gallium/drivers/nouveau/nvc0/nvc0_graph_macros.h index f009980..f009980 100644 --- a/src/gallium/drivers/nvc0/nvc0_graph_macros.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_graph_macros.h diff --git a/src/gallium/drivers/nvc0/nvc0_m2mf.xml.h b/src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h index 3bf628d..3bf628d 100644 --- a/src/gallium/drivers/nvc0/nvc0_m2mf.xml.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h diff --git a/src/gallium/drivers/nvc0/nvc0_miptree.c b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c index f359207..79c9390 100644 --- a/src/gallium/drivers/nvc0/nvc0_miptree.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c @@ -25,8 +25,8 @@ #include "util/u_inlines.h" #include "util/u_format.h" -#include "nvc0_context.h" -#include "nvc0_resource.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_resource.h" static uint32_t nvc0_tex_choose_tile_dims(unsigned nx, unsigned ny, unsigned nz) diff --git a/src/gallium/drivers/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c index 4d50a93..71deb34 100644 --- a/src/gallium/drivers/nvc0/nvc0_program.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c @@ -22,10 +22,10 @@ #include "pipe/p_defines.h" -#include "nvc0_context.h" +#include "nvc0/nvc0_context.h" -#include "nv50/codegen/nv50_ir_driver.h" -#include "nve4_compute.h" +#include "codegen/nv50_ir_driver.h" +#include "nvc0/nve4_compute.h" /* NOTE: Using a[0x270] in FP may cause an error even if we're using less than * 124 scalar varying values. diff --git a/src/gallium/drivers/nvc0/nvc0_program.h b/src/gallium/drivers/nouveau/nvc0/nvc0_program.h index 9c184d1..9c184d1 100644 --- a/src/gallium/drivers/nvc0/nvc0_program.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.h diff --git a/src/gallium/drivers/nvc0/nvc0_push.c b/src/gallium/drivers/nouveau/nvc0/nvc0_push.c index 75caf8a..15e8be6 100644 --- a/src/gallium/drivers/nvc0/nvc0_push.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_push.c @@ -5,10 +5,10 @@ #include "util/u_format.h" #include "translate/translate.h" -#include "nvc0_context.h" -#include "nvc0_resource.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_resource.h" -#include "nvc0_3d.xml.h" +#include "nvc0/nvc0_3d.xml.h" struct push_context { struct nouveau_pushbuf *push; diff --git a/src/gallium/drivers/nvc0/nvc0_query.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c index a9a0bbc..21aa358 100644 --- a/src/gallium/drivers/nvc0/nvc0_query.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c @@ -24,10 +24,10 @@ #define NVC0_PUSH_EXPLICIT_SPACE_CHECKING -#include "nvc0_context.h" -#include "nouveau/nv_object.xml.h" -#include "nve4_compute.xml.h" -#include "nvc0_compute.xml.h" +#include "nvc0/nvc0_context.h" +#include "nv_object.xml.h" +#include "nvc0/nve4_compute.xml.h" +#include "nvc0/nvc0_compute.xml.h" #define NVC0_QUERY_STATE_READY 0 #define NVC0_QUERY_STATE_ACTIVE 1 diff --git a/src/gallium/drivers/nvc0/nvc0_resource.c b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c index 162399f..4e70903 100644 --- a/src/gallium/drivers/nvc0/nvc0_resource.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c @@ -1,7 +1,7 @@ #include "pipe/p_context.h" -#include "nvc0_resource.h" -#include "nouveau/nouveau_screen.h" +#include "nvc0/nvc0_resource.h" +#include "nouveau_screen.h" static struct pipe_resource * diff --git a/src/gallium/drivers/nvc0/nvc0_resource.h b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h index 0d5f026..0d5f026 100644 --- a/src/gallium/drivers/nvc0/nvc0_resource.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h diff --git a/src/gallium/drivers/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index 1de07ff..ff7890b 100644 --- a/src/gallium/drivers/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -27,12 +27,12 @@ #include "vl/vl_decoder.h" #include "vl/vl_video_buffer.h" -#include "nouveau/nouveau_vp3_video.h" +#include "nouveau_vp3_video.h" -#include "nvc0_context.h" -#include "nvc0_screen.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_screen.h" -#include "nvc0_graph_macros.h" +#include "nvc0/nvc0_graph_macros.h" #ifndef NOUVEAU_GETPARAM_GRAPH_UNITS # define NOUVEAU_GETPARAM_GRAPH_UNITS 13 @@ -199,7 +199,7 @@ nvc0_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, default: return 0; } - + switch (param) { case PIPE_SHADER_CAP_PREFERRED_IR: return PIPE_SHADER_IR_TGSI; diff --git a/src/gallium/drivers/nvc0/nvc0_screen.h b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h index e8d3370..27a0c5f 100644 --- a/src/gallium/drivers/nvc0/nvc0_screen.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h @@ -1,15 +1,15 @@ #ifndef __NVC0_SCREEN_H__ #define __NVC0_SCREEN_H__ -#include "nouveau/nouveau_screen.h" -#include "nouveau/nouveau_mm.h" -#include "nouveau/nouveau_fence.h" -#include "nouveau/nouveau_heap.h" +#include "nouveau_screen.h" +#include "nouveau_mm.h" +#include "nouveau_fence.h" +#include "nouveau_heap.h" -#include "nouveau/nv_object.xml.h" +#include "nv_object.xml.h" -#include "nvc0_winsys.h" -#include "nvc0_stateobj.h" +#include "nvc0/nvc0_winsys.h" +#include "nvc0/nvc0_stateobj.h" #define NVC0_TIC_MAX_ENTRIES 2048 #define NVC0_TSC_MAX_ENTRIES 2048 @@ -51,7 +51,7 @@ struct nvc0_screen { int next; uint32_t lock[NVC0_TIC_MAX_ENTRIES / 32]; } tic; - + struct { void **entries; int next; diff --git a/src/gallium/drivers/nvc0/nvc0_shader_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c index cf9c8ce..b820ef2 100644 --- a/src/gallium/drivers/nvc0/nvc0_shader_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c @@ -25,7 +25,7 @@ #include "pipe/p_state.h" #include "util/u_inlines.h" -#include "nvc0_context.h" +#include "nvc0/nvc0_context.h" static INLINE void nvc0_program_update_context_state(struct nvc0_context *nvc0, diff --git a/src/gallium/drivers/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c index 2f40369..e56ef01 100644 --- a/src/gallium/drivers/nvc0/nvc0_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c @@ -27,13 +27,13 @@ #include "tgsi/tgsi_parse.h" -#include "nvc0_stateobj.h" -#include "nvc0_context.h" +#include "nvc0/nvc0_stateobj.h" +#include "nvc0/nvc0_context.h" -#include "nvc0_3d.xml.h" +#include "nvc0/nvc0_3d.xml.h" #include "nv50/nv50_texture.xml.h" -#include "nouveau/nouveau_gldefs.h" +#include "nouveau_gldefs.h" static INLINE uint32_t nvc0_colormask(unsigned mask) @@ -220,7 +220,7 @@ nvc0_rasterizer_state_create(struct pipe_context *pipe, /* Scissor enables are handled in scissor state, we will not want to * always emit 16 commands, one for each scissor rectangle, here. */ - + SB_BEGIN_3D(so, SHADE_MODEL, 1); SB_DATA (so, cso->flatshade ? NVC0_3D_SHADE_MODEL_FLAT : NVC0_3D_SHADE_MODEL_SMOOTH); @@ -245,7 +245,7 @@ nvc0_rasterizer_state_create(struct pipe_context *pipe, SB_BEGIN_3D(so, LINE_STIPPLE_PATTERN, 1); SB_DATA (so, (cso->line_stipple_pattern << 8) | cso->line_stipple_factor); - + } SB_IMMED_3D(so, VP_POINT_SIZE_EN, cso->point_size_per_vertex); @@ -1245,4 +1245,3 @@ nvc0_init_state_functions(struct nvc0_context *nvc0) pipe->set_compute_resources = nvc0_set_compute_resources; pipe->set_shader_resources = nvc0_set_shader_resources; } - diff --git a/src/gallium/drivers/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c index 2b55ade..0ba4bad 100644 --- a/src/gallium/drivers/nvc0/nvc0_state_validate.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c @@ -1,7 +1,7 @@ #include "util/u_math.h" -#include "nvc0_context.h" +#include "nvc0/nvc0_context.h" #if 0 static void diff --git a/src/gallium/drivers/nvc0/nvc0_stateobj.h b/src/gallium/drivers/nouveau/nvc0/nvc0_stateobj.h index 80c3342..80c3342 100644 --- a/src/gallium/drivers/nvc0/nvc0_stateobj.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_stateobj.h diff --git a/src/gallium/drivers/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c index 4ef1a44..5070df8 100644 --- a/src/gallium/drivers/nvc0/nvc0_surface.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c @@ -31,8 +31,8 @@ #include "os/os_thread.h" -#include "nvc0_context.h" -#include "nvc0_resource.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_resource.h" #include "nv50/nv50_defs.xml.h" #include "nv50/nv50_texture.xml.h" @@ -1263,4 +1263,3 @@ nvc0_init_surface_functions(struct nvc0_context *nvc0) pipe->clear_render_target = nvc0_clear_render_target; pipe->clear_depth_stencil = nvc0_clear_depth_stencil; } - diff --git a/src/gallium/drivers/nvc0/nvc0_tex.c b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c index 1c0791b..765cd2d 100644 --- a/src/gallium/drivers/nvc0/nvc0_tex.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c @@ -20,8 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nvc0_context.h" -#include "nvc0_resource.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_resource.h" #include "nv50/nv50_texture.xml.h" #include "nv50/nv50_defs.xml.h" diff --git a/src/gallium/drivers/nvc0/nvc0_transfer.c b/src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c index a0333a3..82f1ffc 100644 --- a/src/gallium/drivers/nvc0/nvc0_transfer.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c @@ -1,7 +1,7 @@ #include "util/u_format.h" -#include "nvc0_context.h" +#include "nvc0/nvc0_context.h" #include "nv50/nv50_defs.xml.h" diff --git a/src/gallium/drivers/nvc0/nvc0_vbo.c b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c index 1e9fc62..c4bc7dc 100644 --- a/src/gallium/drivers/nvc0/nvc0_vbo.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c @@ -28,10 +28,10 @@ #include "util/u_format.h" #include "translate/translate.h" -#include "nvc0_context.h" -#include "nvc0_resource.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_resource.h" -#include "nvc0_3d.xml.h" +#include "nvc0/nvc0_3d.xml.h" void nvc0_vertex_state_delete(struct pipe_context *pipe, diff --git a/src/gallium/drivers/nvc0/nvc0_vbo_translate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c index 6ea4220..51e751c 100644 --- a/src/gallium/drivers/nvc0/nvc0_vbo_translate.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c @@ -5,10 +5,10 @@ #include "util/u_format.h" #include "translate/translate.h" -#include "nvc0_context.h" -#include "nvc0_resource.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_resource.h" -#include "nvc0_3d.xml.h" +#include "nvc0/nvc0_3d.xml.h" struct push_context { struct nouveau_pushbuf *push; diff --git a/src/gallium/drivers/nvc0/nvc0_video.c b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c index 52a634a..5871f59 100644 --- a/src/gallium/drivers/nvc0/nvc0_video.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nvc0_video.h" +#include "nvc0/nvc0_video.h" #include "util/u_sampler.h" #include "util/u_format.h" diff --git a/src/gallium/drivers/nvc0/nvc0_video.h b/src/gallium/drivers/nouveau/nvc0/nvc0_video.h index 5cd79f6..9ee0280 100644 --- a/src/gallium/drivers/nvc0/nvc0_video.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video.h @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nvc0_context.h" -#include "nvc0_screen.h" -#include "nouveau/nouveau_vp3_video.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_screen.h" +#include "nouveau_vp3_video.h" #include "vl/vl_decoder.h" #include "vl/vl_types.h" diff --git a/src/gallium/drivers/nvc0/nvc0_video_bsp.c b/src/gallium/drivers/nouveau/nvc0/nvc0_video_bsp.c index 2edfb8a..40696fa 100644 --- a/src/gallium/drivers/nvc0/nvc0_video_bsp.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video_bsp.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nvc0_video.h" +#include "nvc0/nvc0_video.h" #if NOUVEAU_VP3_DEBUG_FENCE static void dump_comm_bsp(struct comm *comm) diff --git a/src/gallium/drivers/nvc0/nvc0_video_ppp.c b/src/gallium/drivers/nouveau/nvc0/nvc0_video_ppp.c index c1fd1fd..4ceec4f 100644 --- a/src/gallium/drivers/nvc0/nvc0_video_ppp.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video_ppp.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nvc0_video.h" +#include "nvc0/nvc0_video.h" static void nvc0_decoder_setup_ppp(struct nouveau_vp3_decoder *dec, struct nouveau_vp3_video_buffer *target, uint32_t low700) { diff --git a/src/gallium/drivers/nvc0/nvc0_video_vp.c b/src/gallium/drivers/nouveau/nvc0/nvc0_video_vp.c index df9633e..0d152b9 100644 --- a/src/gallium/drivers/nvc0/nvc0_video_vp.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video_vp.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nvc0_video.h" +#include "nvc0/nvc0_video.h" #include <sys/mman.h> #if NOUVEAU_VP3_DEBUG_FENCE diff --git a/src/gallium/drivers/nvc0/nvc0_winsys.h b/src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h index 25183a4..3514d9d 100644 --- a/src/gallium/drivers/nvc0/nvc0_winsys.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h @@ -7,8 +7,8 @@ #include "pipe/p_defines.h" -#include "nouveau/nouveau_winsys.h" -#include "nouveau/nouveau_buffer.h" +#include "nouveau_winsys.h" +#include "nouveau_buffer.h" #ifndef NV04_PFIFO_MAX_PACKET_LEN #define NV04_PFIFO_MAX_PACKET_LEN 2047 diff --git a/src/gallium/drivers/nvc0/nve4_compute.c b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c index 8b39f73..06c914f 100644 --- a/src/gallium/drivers/nvc0/nve4_compute.c +++ b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c @@ -22,11 +22,11 @@ * Authors: Christoph Bumiller */ -#include "nvc0_context.h" -#include "nvc0_compute.h" -#include "nve4_compute.h" +#include "nvc0/nvc0_context.h" +#include "nvc0/nvc0_compute.h" +#include "nvc0/nve4_compute.h" -#include "nv50/codegen/nv50_ir_driver.h" +#include "codegen/nv50_ir_driver.h" #ifdef DEBUG static void nve4_compute_dump_launch_desc(const struct nve4_cp_launch_desc *); diff --git a/src/gallium/drivers/nvc0/nve4_compute.h b/src/gallium/drivers/nouveau/nvc0/nve4_compute.h index 4939790..79862b7 100644 --- a/src/gallium/drivers/nvc0/nve4_compute.h +++ b/src/gallium/drivers/nouveau/nvc0/nve4_compute.h @@ -3,7 +3,7 @@ #define NVE4_COMPUTE_H #include "nv50/nv50_defs.xml.h" -#include "nve4_compute.xml.h" +#include "nvc0/nve4_compute.xml.h" /* Input space is implemented as c0[], to which we bind the screen->parm bo. */ diff --git a/src/gallium/drivers/nvc0/nve4_compute.xml.h b/src/gallium/drivers/nouveau/nvc0/nve4_compute.xml.h index e971fc1..e971fc1 100644 --- a/src/gallium/drivers/nvc0/nve4_compute.xml.h +++ b/src/gallium/drivers/nouveau/nvc0/nve4_compute.xml.h diff --git a/src/gallium/drivers/nvc0/nve4_p2mf.xml.h b/src/gallium/drivers/nouveau/nvc0/nve4_p2mf.xml.h index 68a742f..68a742f 100644 --- a/src/gallium/drivers/nvc0/nve4_p2mf.xml.h +++ b/src/gallium/drivers/nouveau/nvc0/nve4_p2mf.xml.h diff --git a/src/gallium/drivers/nv30/Android.mk b/src/gallium/drivers/nv30/Android.mk deleted file mode 100644 index fec076c..0000000 --- a/src/gallium/drivers/nv30/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Chia-I Wu <olvaffe@gmail.com> -# Copyright (C) 2011 LunarG Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES and CPP_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) $(CPP_SOURCES) -LOCAL_C_INCLUDES := $(DRM_TOP) - -LOCAL_MODULE := libmesa_pipe_nv30 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/drivers/nv30/Makefile.am b/src/gallium/drivers/nv30/Makefile.am deleted file mode 100644 index e7d1983..0000000 --- a/src/gallium/drivers/nv30/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -noinst_LTLIBRARIES = libnv30.la - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/include \ - $(GALLIUM_CFLAGS) \ - $(NOUVEAU_CFLAGS) - -libnv30_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/drivers/nv30/Makefile.sources b/src/gallium/drivers/nv30/Makefile.sources deleted file mode 100644 index f3d8ad5..0000000 --- a/src/gallium/drivers/nv30/Makefile.sources +++ /dev/null @@ -1,20 +0,0 @@ -C_SOURCES := nv30_screen.c \ - nv30_context.c \ - nv30_format.c \ - nv30_resource.c \ - nv30_transfer.c \ - nv30_miptree.c \ - nv30_state.c \ - nv30_state_validate.c \ - nv30_texture.c \ - nv30_fragtex.c \ - nv40_verttex.c \ - nv30_fragprog.c \ - nv30_vertprog.c \ - nv30_clear.c \ - nv30_vbo.c \ - nv30_push.c \ - nv30_draw.c \ - nv30_query.c \ - nvfx_vertprog.c \ - nvfx_fragprog.c diff --git a/src/gallium/drivers/nv50/Android.mk b/src/gallium/drivers/nv50/Android.mk deleted file mode 100644 index 6fff9ce..0000000 --- a/src/gallium/drivers/nv50/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Chia-I Wu <olvaffe@gmail.com> -# Copyright (C) 2011 LunarG Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES and CPP_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) $(CPP_SOURCES) -LOCAL_C_INCLUDES := $(DRM_TOP) - -LOCAL_MODULE := libmesa_pipe_nv50 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/drivers/nv50/Makefile.am b/src/gallium/drivers/nv50/Makefile.am deleted file mode 100644 index 58c26ef..0000000 --- a/src/gallium/drivers/nv50/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -noinst_LTLIBRARIES = libnv50.la - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/include \ - $(GALLIUM_CFLAGS) \ - $(NOUVEAU_CFLAGS) - -libnv50_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) diff --git a/src/gallium/drivers/nv50/Makefile.sources b/src/gallium/drivers/nv50/Makefile.sources deleted file mode 100644 index 9a2d102..0000000 --- a/src/gallium/drivers/nv50/Makefile.sources +++ /dev/null @@ -1,49 +0,0 @@ -C_SOURCES := \ - nv50_context.c \ - nv50_formats.c \ - nv50_miptree.c \ - nv50_resource.c \ - nv50_screen.c \ - nv50_state.c \ - nv50_state_validate.c \ - nv50_surface.c \ - nv50_tex.c \ - nv50_transfer.c \ - nv50_vbo.c \ - nv50_program.c \ - nv50_shader_state.c \ - nv50_push.c \ - nv50_query.c \ - nv84_video.c \ - nv84_video_bsp.c \ - nv84_video_vp.c \ - nv98_video.c \ - nv98_video_bsp.c \ - nv98_video_vp.c \ - nv98_video_ppp.c - -CODEGEN_NV50_SOURCES := \ - codegen/nv50_ir.cpp \ - codegen/nv50_ir_bb.cpp \ - codegen/nv50_ir_build_util.cpp \ - codegen/nv50_ir_emit_nv50.cpp \ - codegen/nv50_ir_from_tgsi.cpp \ - codegen/nv50_ir_graph.cpp \ - codegen/nv50_ir_lowering_nv50.cpp \ - codegen/nv50_ir_peephole.cpp \ - codegen/nv50_ir_print.cpp \ - codegen/nv50_ir_ra.cpp \ - codegen/nv50_ir_ssa.cpp \ - codegen/nv50_ir_target.cpp \ - codegen/nv50_ir_target_nv50.cpp \ - codegen/nv50_ir_util.cpp - -CODEGEN_NVC0_SOURCES := \ - $(top_srcdir)/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp \ - $(top_srcdir)/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp \ - $(top_srcdir)/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp \ - $(top_srcdir)/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp - -CPP_SOURCES := \ - $(CODEGEN_NV50_SOURCES) \ - $(CODEGEN_NVC0_SOURCES) diff --git a/src/gallium/drivers/nvc0/Android.mk b/src/gallium/drivers/nvc0/Android.mk deleted file mode 100644 index 5617ad6..0000000 --- a/src/gallium/drivers/nvc0/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Chia-I Wu <olvaffe@gmail.com> -# Copyright (C) 2011 LunarG Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES and CPP_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) $(CPP_SOURCES) -LOCAL_C_INCLUDES := $(DRM_TOP) - -LOCAL_MODULE := libmesa_pipe_nvc0 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/drivers/nvc0/Makefile.am b/src/gallium/drivers/nvc0/Makefile.am deleted file mode 100644 index 45e5a63..0000000 --- a/src/gallium/drivers/nvc0/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -noinst_LTLIBRARIES = libnvc0.la - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/include \ - $(GALLIUM_CFLAGS) \ - $(NOUVEAU_CFLAGS) - -libnvc0_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) diff --git a/src/gallium/drivers/nvc0/Makefile.sources b/src/gallium/drivers/nvc0/Makefile.sources deleted file mode 100644 index 815a27a..0000000 --- a/src/gallium/drivers/nvc0/Makefile.sources +++ /dev/null @@ -1,22 +0,0 @@ -C_SOURCES := \ - nvc0_compute.c \ - nvc0_context.c \ - nvc0_formats.c \ - nvc0_miptree.c \ - nvc0_resource.c \ - nvc0_screen.c \ - nvc0_state.c \ - nvc0_state_validate.c \ - nvc0_surface.c \ - nvc0_tex.c \ - nvc0_transfer.c \ - nvc0_vbo.c \ - nvc0_vbo_translate.c \ - nvc0_program.c \ - nvc0_shader_state.c \ - nvc0_query.c \ - nve4_compute.c \ - nvc0_video.c \ - nvc0_video_bsp.c \ - nvc0_video_vp.c \ - nvc0_video_ppp.c |