From cdd3a34096775e2ca18e5608042bb0d9c9cfb562 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 29 Aug 2014 23:06:57 +0100 Subject: [PATCH] gallium/r300: ship all files in the tarball - include all headers in Makefile.sources - sort the list(s) - bundle the android buildscript & the tests Signed-off-by: Emil Velikov Acked-by: Matt Turner --- src/gallium/drivers/r300/Makefile.am | 4 + src/gallium/drivers/r300/Makefile.sources | 93 +++++++++++++++++------ 2 files changed, 72 insertions(+), 25 deletions(-) diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am index f5107f8aa9c..7692bd815ed 100644 --- a/src/gallium/drivers/r300/Makefile.am +++ b/src/gallium/drivers/r300/Makefile.am @@ -37,3 +37,7 @@ libr300_la_SOURCES = $(C_SOURCES) # in place of libmesagallium. libr300_helper_la_CPPFLAGS = -I$(top_srcdir)/src libr300_helper_la_SOURCES = $(HELPER_SOURCES) + +EXTRA_DIST = Android.mk \ + compiler/tests/omod_two_writers.test \ + compiler/tests/regalloc_tex_1d_swizzle.test diff --git a/src/gallium/drivers/r300/Makefile.sources b/src/gallium/drivers/r300/Makefile.sources index f987cf8540f..ab1c9de394e 100644 --- a/src/gallium/drivers/r300/Makefile.sources +++ b/src/gallium/drivers/r300/Makefile.sources @@ -1,70 +1,113 @@ C_SOURCES := \ r300_blit.c \ + r300_cb.h \ r300_chipset.c \ + r300_chipset.h \ r300_context.c \ + r300_context.h \ + r300_cs.h \ r300_debug.c \ + r300_defines.h \ r300_emit.c \ + r300_emit.h \ r300_flush.c \ r300_fs.c \ + r300_fs.h \ r300_hyperz.c \ + r300_public.h \ r300_query.c \ + r300_reg.h \ r300_render.c \ r300_render_stencilref.c \ r300_render_translate.c \ r300_resource.c \ - r300_screen.c \ r300_screen_buffer.c \ + r300_screen_buffer.h \ + r300_screen.c \ + r300_screen.h \ + r300_shader_semantics.h \ r300_state.c \ r300_state_derived.c \ - r300_vs.c \ - r300_vs_draw.c \ + r300_state_inlines.h \ r300_texture.c \ r300_texture_desc.c \ + r300_texture_desc.h \ + r300_texture.h \ r300_tgsi_to_rc.c \ + r300_tgsi_to_rc.h \ r300_transfer.c \ + r300_transfer.h \ + r300_vs.c \ + r300_vs_draw.c \ + r300_vs.h \ \ + compiler/memory_pool.c \ + compiler/memory_pool.h \ + compiler/r300_fragprog.c \ + compiler/r300_fragprog_emit.c \ + compiler/r300_fragprog.h \ + compiler/r300_fragprog_swizzle.c \ + compiler/r300_fragprog_swizzle.h \ + compiler/r3xx_fragprog.c \ + compiler/r3xx_vertprog.c \ + compiler/r3xx_vertprog_dump.c \ + compiler/r500_fragprog.c \ + compiler/r500_fragprog_emit.c \ + compiler/r500_fragprog.h \ compiler/radeon_code.c \ + compiler/radeon_code.h \ compiler/radeon_compiler.c \ + compiler/radeon_compiler.h \ compiler/radeon_compiler_util.c \ + compiler/radeon_compiler_util.h \ + compiler/radeon_dataflow.c \ + compiler/radeon_dataflow_deadcode.c \ + compiler/radeon_dataflow.h \ + compiler/radeon_dataflow_swizzles.c \ compiler/radeon_emulate_branches.c \ + compiler/radeon_emulate_branches.h \ compiler/radeon_emulate_loops.c \ + compiler/radeon_emulate_loops.h \ compiler/radeon_inline_literals.c \ - compiler/radeon_program.c \ - compiler/radeon_program_print.c \ + compiler/radeon_list.c \ + compiler/radeon_list.h \ compiler/radeon_opcodes.c \ + compiler/radeon_opcodes.h \ + compiler/radeon_optimize.c \ + compiler/radeon_pair_dead_sources.c \ + compiler/radeon_pair_regalloc.c \ + compiler/radeon_pair_schedule.c \ + compiler/radeon_pair_translate.c \ compiler/radeon_program_alu.c \ + compiler/radeon_program_alu.h \ + compiler/radeon_program.c \ + compiler/radeon_program_constants.h \ + compiler/radeon_program.h \ compiler/radeon_program_pair.c \ + compiler/radeon_program_pair.h \ + compiler/radeon_program_print.c \ compiler/radeon_program_tex.c \ - compiler/radeon_pair_translate.c \ - compiler/radeon_pair_schedule.c \ - compiler/radeon_pair_regalloc.c \ - compiler/radeon_pair_dead_sources.c \ - compiler/radeon_dataflow.c \ - compiler/radeon_dataflow_deadcode.c \ - compiler/radeon_dataflow_swizzles.c \ - compiler/radeon_list.c \ - compiler/radeon_optimize.c \ + compiler/radeon_program_tex.h \ + compiler/radeon_regalloc.h \ compiler/radeon_remove_constants.c \ + compiler/radeon_remove_constants.h \ compiler/radeon_rename_regs.c \ - compiler/radeon_vert_fc.c \ + compiler/radeon_rename_regs.h \ + compiler/radeon_swizzle.h \ compiler/radeon_variable.c \ - compiler/r3xx_fragprog.c \ - compiler/r300_fragprog.c \ - compiler/r300_fragprog_swizzle.c \ - compiler/r300_fragprog_emit.c \ - compiler/r500_fragprog.c \ - compiler/r500_fragprog_emit.c \ - compiler/r3xx_vertprog.c \ - compiler/r3xx_vertprog_dump.c \ - compiler/memory_pool.c + compiler/radeon_variable.h \ + compiler/radeon_vert_fc.c COMPILER_TESTS_SOURCES := \ compiler/tests/r300_compiler_tests.c \ + compiler/tests/r300_compiler_tests.h \ compiler/tests/radeon_compiler_optimize_tests.c \ compiler/tests/radeon_compiler_regalloc_tests.c \ compiler/tests/radeon_compiler_util_tests.c \ compiler/tests/rc_test_helpers.c \ - compiler/tests/unit_test.c + compiler/tests/rc_test_helpers.h \ + compiler/tests/unit_test.c \ + compiler/tests/unit_test.h HELPER_SOURCES := \ register_allocate.c -- 2.30.2