Module: Mesa Branch: master Commit: 330b6c85c961b32f704ce8ec7dbf8cb7fc0b80a8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=330b6c85c961b32f704ce8ec7dbf8cb7fc0b80a8
Author: Marek Olšák <[email protected]> Date: Mon Mar 5 15:17:00 2012 +0100 r600g: cleanup includes --- src/gallium/drivers/r600/eg_asm.c | 10 +++----- src/gallium/drivers/r600/evergreen_hw_context.c | 3 -- src/gallium/drivers/r600/evergreen_state.c | 23 ++------------------ src/gallium/drivers/r600/r600_asm.c | 13 ++++------- src/gallium/drivers/r600/r600_asm.h | 2 + src/gallium/drivers/r600/r600_blit.c | 2 +- src/gallium/drivers/r600/r600_buffer.c | 10 +-------- src/gallium/drivers/r600/r600_formats.h | 1 + src/gallium/drivers/r600/r600_hw_context.c | 1 - src/gallium/drivers/r600/r600_hw_context_priv.h | 2 - src/gallium/drivers/r600/r600_pipe.c | 25 +++------------------- src/gallium/drivers/r600/r600_pipe.h | 8 ------- src/gallium/drivers/r600/r600_resource.h | 3 +- src/gallium/drivers/r600/r600_shader.c | 14 ++++-------- src/gallium/drivers/r600/r600_state.c | 21 ++---------------- src/gallium/drivers/r600/r600_state_common.c | 10 ++------ src/gallium/drivers/r600/r600_texture.c | 12 ++-------- src/gallium/drivers/r600/r600_translate.c | 3 +- src/gallium/drivers/r600/r700_asm.c | 3 -- 19 files changed, 37 insertions(+), 129 deletions(-) diff --git a/src/gallium/drivers/r600/eg_asm.c b/src/gallium/drivers/r600/eg_asm.c index e867ea4..b6d03ef 100644 --- a/src/gallium/drivers/r600/eg_asm.c +++ b/src/gallium/drivers/r600/eg_asm.c @@ -20,14 +20,12 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> -#include <errno.h> -#include "util/u_memory.h" #include "r600_pipe.h" -#include "r600_asm.h" -#include "eg_sq.h" #include "r600_opcodes.h" -#include "evergreend.h" + +#include "util/u_memory.h" +#include "eg_sq.h" +#include <errno.h> int eg_bytecode_cf_build(struct r600_bytecode *bc, struct r600_bytecode_cf *cf) { diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c index 16faa56..92a8013 100644 --- a/src/gallium/drivers/r600/evergreen_hw_context.c +++ b/src/gallium/drivers/r600/evergreen_hw_context.c @@ -23,12 +23,9 @@ * Authors: * Jerome Glisse */ -#include "r600.h" #include "r600_hw_context_priv.h" -#include "r600_pipe.h" #include "evergreend.h" #include "util/u_memory.h" -#include <errno.h> static const struct r600_reg evergreen_config_reg_list[] = { {R_008958_VGT_PRIMITIVE_TYPE, 0}, diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 5d0fabc..9bae17d 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -20,30 +20,13 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "r600_formats.h" +#include "evergreend.h" -#include <stdio.h> -#include <errno.h> -#include "pipe/p_defines.h" -#include "pipe/p_state.h" -#include "pipe/p_context.h" -#include "tgsi/tgsi_scan.h" -#include "tgsi/tgsi_parse.h" -#include "tgsi/tgsi_util.h" -#include "util/u_blitter.h" -#include "util/u_double_list.h" -#include "util/u_transfer.h" -#include "util/u_surface.h" +#include "pipe/p_shader_tokens.h" #include "util/u_pack_color.h" #include "util/u_memory.h" -#include "util/u_inlines.h" #include "util/u_framebuffer.h" -#include "pipebuffer/pb_buffer.h" -#include "r600.h" -#include "evergreend.h" -#include "r600_resource.h" -#include "r600_shader.h" -#include "r600_pipe.h" -#include "r600_formats.h" static uint32_t eg_num_banks(uint32_t nbanks) { diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index dc19936..00f1a8b 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -20,19 +20,16 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> -#include <errno.h> -#include <byteswap.h> -#include "util/u_format.h" -#include "util/u_memory.h" -#include "pipe/p_shader_tokens.h" -#include "r600_pipe.h" #include "r600_sq.h" #include "r600_opcodes.h" -#include "r600_asm.h" #include "r600_formats.h" #include "r600d.h" +#include <errno.h> +#include <byteswap.h> +#include "util/u_memory.h" +#include "pipe/p_shader_tokens.h" + #define NUM_OF_CYCLES 3 #define NUM_OF_COMPONENTS 4 diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h index f430852..5790ead 100644 --- a/src/gallium/drivers/r600/r600_asm.h +++ b/src/gallium/drivers/r600/r600_asm.h @@ -23,6 +23,8 @@ #ifndef R600_ASM_H #define R600_ASM_H +#include "r600.h" + struct r600_vertex_element; struct r600_context; diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 9ab85c8..c748fca 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -20,10 +20,10 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "r600_pipe.h" #include "util/u_surface.h" #include "util/u_blitter.h" #include "util/u_format.h" -#include "r600_pipe.h" enum r600_blitter_op /* bitmask */ { diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c index 733d707..b275319 100644 --- a/src/gallium/drivers/r600/r600_buffer.c +++ b/src/gallium/drivers/r600/r600_buffer.c @@ -24,18 +24,10 @@ * Jerome Glisse * Corbin Simpson <[email protected]> */ +#include "r600_pipe.h" #include <byteswap.h> - -#include "pipe/p_screen.h" -#include "util/u_format.h" -#include "util/u_math.h" -#include "util/u_inlines.h" -#include "util/u_memory.h" #include "util/u_upload_mgr.h" -#include "r600.h" -#include "r600_pipe.h" - static void r600_buffer_destroy(struct pipe_screen *screen, struct pipe_resource *buf) { diff --git a/src/gallium/drivers/r600/r600_formats.h b/src/gallium/drivers/r600/r600_formats.h index b822cba..af6de1c 100644 --- a/src/gallium/drivers/r600/r600_formats.h +++ b/src/gallium/drivers/r600/r600_formats.h @@ -1,6 +1,7 @@ #ifndef R600_FORMATS_H #define R600_FORMATS_H +#include "util/u_format.h" #include "r600_pipe.h" /* list of formats from R700 ISA document - apply across GPUs in different registers */ diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index 68b8a62..ee36a07 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -24,7 +24,6 @@ * Jerome Glisse */ #include "r600_hw_context_priv.h" -#include "r600_pipe.h" #include "r600d.h" #include "util/u_memory.h" #include <errno.h> diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h index 47a14ff..037d5e3 100644 --- a/src/gallium/drivers/r600/r600_hw_context_priv.h +++ b/src/gallium/drivers/r600/r600_hw_context_priv.h @@ -27,8 +27,6 @@ #define R600_PRIV_H #include "r600_pipe.h" -#include "util/u_hash_table.h" -#include "os/os_thread.h" #define R600_MAX_DRAW_CS_DWORDS 11 diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index df1ca6b..4df78f9 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -20,34 +20,17 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> +#include "r600_pipe.h" +#include "r600_public.h" + #include <errno.h> -#include "pipe/p_defines.h" -#include "pipe/p_state.h" -#include "pipe/p_context.h" -#include "tgsi/tgsi_scan.h" -#include "tgsi/tgsi_parse.h" -#include "tgsi/tgsi_util.h" +#include "pipe/p_shader_tokens.h" #include "util/u_blitter.h" -#include "util/u_double_list.h" -#include "util/u_format.h" #include "util/u_format_s3tc.h" -#include "util/u_transfer.h" -#include "util/u_surface.h" -#include "util/u_pack_color.h" -#include "util/u_memory.h" -#include "util/u_inlines.h" #include "util/u_simple_shaders.h" -#include "util/u_upload_mgr.h" #include "vl/vl_decoder.h" #include "vl/vl_video_buffer.h" #include "os/os_time.h" -#include "pipebuffer/pb_buffer.h" -#include "r600.h" -#include "r600d.h" -#include "r600_resource.h" -#include "r600_shader.h" -#include "r600_pipe.h" /* * pipe_context diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index d92de42..499918b 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -26,16 +26,8 @@ #ifndef R600_PIPE_H #define R600_PIPE_H -#include "../../winsys/radeon/drm/radeon_winsys.h" - -#include "pipe/p_state.h" -#include "pipe/p_screen.h" -#include "pipe/p_context.h" -#include "util/u_math.h" #include "util/u_slab.h" -#include "util/u_vbuf.h" #include "r600.h" -#include "r600_public.h" #include "r600_shader.h" #include "r600_resource.h" diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h index 4252223..15b706d 100644 --- a/src/gallium/drivers/r600/r600_resource.h +++ b/src/gallium/drivers/r600/r600_resource.h @@ -23,8 +23,7 @@ #ifndef R600_RESOURCE_H #define R600_RESOURCE_H -#include "util/u_transfer.h" -#include "util/u_vbuf.h" +#include "r600.h" /* flag to indicate a resource is to be used as a transfer so should not be tiled */ #define R600_RESOURCE_FLAG_TRANSFER PIPE_RESOURCE_FLAG_DRV_PRIV diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 4cf39f6..1adf344 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -20,19 +20,15 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "pipe/p_shader_tokens.h" -#include "tgsi/tgsi_info.h" -#include "tgsi/tgsi_parse.h" -#include "tgsi/tgsi_scan.h" -#include "tgsi/tgsi_dump.h" -#include "util/u_format.h" -#include "r600_pipe.h" -#include "r600_asm.h" #include "r600_sq.h" #include "r600_formats.h" #include "r600_opcodes.h" #include "r600d.h" -#include <stdio.h> + +#include "tgsi/tgsi_info.h" +#include "tgsi/tgsi_parse.h" +#include "tgsi/tgsi_scan.h" +#include "tgsi/tgsi_dump.h" #include <errno.h> #include <byteswap.h> diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 9b1dd3c..9ace944 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -20,28 +20,13 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "r600_formats.h" +#include "r600d.h" -#include <stdio.h> -#include <errno.h> -#include "pipe/p_defines.h" -#include "pipe/p_state.h" -#include "pipe/p_context.h" -#include "tgsi/tgsi_scan.h" -#include "tgsi/tgsi_parse.h" -#include "tgsi/tgsi_util.h" -#include "util/u_double_list.h" +#include "pipe/p_shader_tokens.h" #include "util/u_pack_color.h" #include "util/u_memory.h" -#include "util/u_inlines.h" #include "util/u_framebuffer.h" -#include "util/u_transfer.h" -#include "pipebuffer/pb_buffer.h" -#include "r600.h" -#include "r600d.h" -#include "r600_resource.h" -#include "r600_shader.h" -#include "r600_pipe.h" -#include "r600_formats.h" static uint32_t r600_translate_blend_function(int blend_func) { diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 77bfcea..0eaba4c 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -24,16 +24,12 @@ * Authors: Dave Airlie <[email protected]> * Jerome Glisse <[email protected]> */ -#include "util/u_blitter.h" -#include "util/u_memory.h" -#include "util/u_format.h" -#include "pipebuffer/pb_buffer.h" -#include "pipe/p_shader_tokens.h" -#include "tgsi/tgsi_parse.h" #include "r600_formats.h" -#include "r600_pipe.h" #include "r600d.h" +#include "util/u_blitter.h" +#include "tgsi/tgsi_parse.h" + static void r600_emit_command_buffer(struct r600_context *rctx, struct r600_atom *atom) { struct radeon_winsys_cs *cs = rctx->cs; diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index e55e0d2..923efce 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -24,18 +24,12 @@ * Jerome Glisse * Corbin Simpson */ +#include "r600_formats.h" +#include "r600d.h" + #include <errno.h> -#include "pipe/p_screen.h" -#include "util/u_format.h" #include "util/u_format_s3tc.h" -#include "util/u_math.h" -#include "util/u_inlines.h" #include "util/u_memory.h" -#include "pipebuffer/pb_buffer.h" -#include "r600_pipe.h" -#include "r600_resource.h" -#include "r600d.h" -#include "r600_formats.h" /* Copy from a full GPU texture to a transfer's staging one. */ static void r600_copy_to_staging_texture(struct pipe_context *ctx, struct r600_transfer *rtransfer) diff --git a/src/gallium/drivers/r600/r600_translate.c b/src/gallium/drivers/r600/r600_translate.c index fd415be..a556782 100644 --- a/src/gallium/drivers/r600/r600_translate.c +++ b/src/gallium/drivers/r600/r600_translate.c @@ -23,10 +23,9 @@ * Authors: Dave Airlie <[email protected]> */ +#include "r600_pipe.h" #include "util/u_index_modify.h" -#include "util/u_inlines.h" #include "util/u_upload_mgr.h" -#include "r600_pipe.h" void r600_translate_index_buffer(struct r600_context *r600, diff --git a/src/gallium/drivers/r600/r700_asm.c b/src/gallium/drivers/r600/r700_asm.c index fa304ed..ffa179f 100644 --- a/src/gallium/drivers/r600/r700_asm.c +++ b/src/gallium/drivers/r600/r700_asm.c @@ -20,9 +20,6 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> -#include "util/u_memory.h" -#include "r600_pipe.h" #include "r600_asm.h" #include "r700_sq.h" _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
