From a9ae7635b77fc4fd9f4614fead63fefa6ff74f4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 22 Jan 2014 00:58:12 +0100 Subject: [PATCH] r600g,radeonsi: consolidate the contents of r600_resource.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Michel Dänzer Reviewed-by: Tom Stellard --- src/gallium/drivers/r600/Makefile.sources | 1 - src/gallium/drivers/r600/r600_pipe.c | 13 +++- src/gallium/drivers/r600/r600_pipe.h | 3 - src/gallium/drivers/r600/r600_resource.c | 76 ------------------- src/gallium/drivers/r600/r600_resource.h | 3 - src/gallium/drivers/radeon/r600_pipe_common.c | 19 +++++ src/gallium/drivers/radeon/r600_pipe_common.h | 6 +- src/gallium/drivers/radeon/r600_texture.c | 18 +++-- src/gallium/drivers/radeonsi/Makefile.sources | 1 - src/gallium/drivers/radeonsi/si_pipe.c | 2 - src/gallium/drivers/radeonsi/si_pipe.h | 3 - src/gallium/drivers/radeonsi/si_resource.c | 61 --------------- src/gallium/drivers/radeonsi/si_resource.h | 2 - 13 files changed, 45 insertions(+), 163 deletions(-) delete mode 100644 src/gallium/drivers/r600/r600_resource.c delete mode 100644 src/gallium/drivers/radeonsi/si_resource.c diff --git a/src/gallium/drivers/r600/Makefile.sources b/src/gallium/drivers/r600/Makefile.sources index f04e156d086..82560fce423 100644 --- a/src/gallium/drivers/r600/Makefile.sources +++ b/src/gallium/drivers/r600/Makefile.sources @@ -4,7 +4,6 @@ C_SOURCES = \ r600_hw_context.c \ r600_isa.c \ r600_pipe.c \ - r600_resource.c \ r600_shader.c \ r600_state.c \ r700_asm.c \ diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index e217be5abae..abc25b29efe 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -211,7 +211,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void rctx->keep_tiling_flags = rscreen->b.info.drm_minor >= 12; r600_init_blit_functions(rctx); - r600_init_context_resource_functions(rctx); if (rscreen->b.info.has_uvd) { rctx->b.b.create_video_codec = r600_uvd_create_decoder; @@ -826,6 +825,16 @@ static int r600_get_driver_query_info(struct pipe_screen *screen, return 1; } +static struct pipe_resource *r600_resource_create(struct pipe_screen *screen, + const struct pipe_resource *templ) +{ + if (templ->target == PIPE_BUFFER && + (templ->bind & PIPE_BIND_GLOBAL)) + return r600_compute_global_buffer_create(screen, templ); + + return r600_resource_create_common(screen, templ); +} + struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) { struct r600_screen *rscreen = CALLOC_STRUCT(r600_screen); @@ -859,7 +868,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) rscreen->b.b.get_video_param = r600_get_video_param; rscreen->b.b.is_video_format_supported = vl_video_buffer_is_format_supported; } - r600_init_screen_resource_functions(&rscreen->b.b); + rscreen->b.b.resource_create = r600_resource_create; if (!r600_common_screen_init(&rscreen->b, ws)) { FREE(rscreen); diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 85bebc3bbf8..101d7405ee1 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -535,9 +535,6 @@ void r600_decompress_color_textures(struct r600_context *rctx, /* r600_pipe.c */ const char * r600_llvm_gpu_string(enum radeon_family family); -/* r600_resource.c */ -void r600_init_context_resource_functions(struct r600_context *r600); - /* r600_shader.c */ int r600_pipe_shader_create(struct pipe_context *ctx, struct r600_pipe_shader *shader, diff --git a/src/gallium/drivers/r600/r600_resource.c b/src/gallium/drivers/r600/r600_resource.c deleted file mode 100644 index a8fa357b133..00000000000 --- a/src/gallium/drivers/r600/r600_resource.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2010 Marek Olšák target == PIPE_BUFFER) { - if (templ->bind & PIPE_BIND_GLOBAL) { - return r600_compute_global_buffer_create(screen, templ); - } - else { - return r600_buffer_create(screen, templ, 4096); - } - } else { - return r600_texture_create(screen, templ); - } -} - -static struct pipe_resource *r600_resource_from_handle(struct pipe_screen * screen, - const struct pipe_resource *templ, - struct winsys_handle *whandle) -{ - if (templ->target == PIPE_BUFFER) { - return NULL; - } else { - return r600_texture_from_handle(screen, templ, whandle); - } -} - -void r600_resource_destroy(struct pipe_screen *screen, struct pipe_resource *res) -{ - if (res->target == PIPE_BUFFER && (res->bind & PIPE_BIND_GLOBAL)) { - r600_compute_global_buffer_destroy(screen, res); - } else { - u_resource_destroy_vtbl(screen, res); - } -} - -void r600_init_screen_resource_functions(struct pipe_screen *screen) -{ - screen->resource_create = r600_resource_create; - screen->resource_from_handle = r600_resource_from_handle; - screen->resource_get_handle = u_resource_get_handle_vtbl; - screen->resource_destroy = r600_resource_destroy; -} - -void r600_init_context_resource_functions(struct r600_context *r600) -{ - r600->b.b.transfer_map = u_transfer_map_vtbl; - r600->b.b.transfer_flush_region = u_default_transfer_flush_region; - r600->b.b.transfer_unmap = u_transfer_unmap_vtbl; - r600->b.b.transfer_inline_write = u_default_transfer_inline_write; -} diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h index 96fea9afe0e..db88c9a5f00 100644 --- a/src/gallium/drivers/r600/r600_resource.h +++ b/src/gallium/drivers/r600/r600_resource.h @@ -86,7 +86,4 @@ static INLINE bool r600_can_read_depth(struct r600_texture *rtex) rtex->resource.b.b.format == PIPE_FORMAT_Z32_FLOAT); } -void r600_resource_destroy(struct pipe_screen *screen, struct pipe_resource *res); -void r600_init_screen_resource_functions(struct pipe_screen *screen); - #endif diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index ad6dd253a1d..031f858dfe6 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -191,6 +191,16 @@ static bool r600_init_tiling(struct r600_common_screen *rscreen) } } +struct pipe_resource *r600_resource_create_common(struct pipe_screen *screen, + const struct pipe_resource *templ) +{ + if (templ->target == PIPE_BUFFER) { + return r600_buffer_create(screen, templ, 4096); + } else { + return r600_texture_create(screen, templ); + } +} + bool r600_common_screen_init(struct r600_common_screen *rscreen, struct radeon_winsys *ws) { @@ -199,6 +209,10 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen, rscreen->b.fence_finish = r600_fence_finish; rscreen->b.fence_reference = r600_fence_reference; rscreen->b.fence_signalled = r600_fence_signalled; + rscreen->b.resource_create = r600_resource_create_common; + rscreen->b.resource_destroy = u_resource_destroy_vtbl; + + r600_init_texture_functions(rscreen); rscreen->ws = ws; rscreen->family = rscreen->info.family; @@ -234,6 +248,11 @@ bool r600_common_context_init(struct r600_common_context *rctx, rctx->chip_class = rscreen->chip_class; rctx->max_db = rscreen->chip_class >= EVERGREEN ? 8 : 4; + rctx->b.transfer_map = u_transfer_map_vtbl; + rctx->b.transfer_flush_region = u_default_transfer_flush_region; + rctx->b.transfer_unmap = u_transfer_unmap_vtbl; + rctx->b.transfer_inline_write = u_default_transfer_inline_write; + r600_streamout_init(rctx); r600_query_init(rctx); diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 48674c6e625..5496a12f2c1 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -333,6 +333,8 @@ bool r600_can_dump_shader(struct r600_common_screen *rscreen, const struct tgsi_token *tokens); void r600_screen_clear_buffer(struct r600_common_screen *rscreen, struct pipe_resource *dst, unsigned offset, unsigned size, unsigned value); +struct pipe_resource *r600_resource_create_common(struct pipe_screen *screen, + const struct pipe_resource *templ); /* r600_query.c */ void r600_query_init(struct r600_common_context *rctx); @@ -364,9 +366,7 @@ bool r600_init_flushed_depth_texture(struct pipe_context *ctx, struct r600_texture **staging); struct pipe_resource *r600_texture_create(struct pipe_screen *screen, const struct pipe_resource *templ); -struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen, - const struct pipe_resource *base, - struct winsys_handle *whandle); +void r600_init_texture_functions(struct r600_common_screen *rscreen); /* Inline helpers. */ diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index caf3743e72f..878b26f2093 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -236,8 +236,8 @@ static int r600_setup_surface(struct pipe_screen *screen, } static boolean r600_texture_get_handle(struct pipe_screen* screen, - struct pipe_resource *ptex, - struct winsys_handle *whandle) + struct pipe_resource *ptex, + struct winsys_handle *whandle) { struct r600_texture *rtex = (struct r600_texture*)ptex; struct r600_resource *resource = &rtex->resource; @@ -763,9 +763,9 @@ struct pipe_resource *r600_texture_create(struct pipe_screen *screen, 0, NULL, &surface); } -struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen, - const struct pipe_resource *templ, - struct winsys_handle *whandle) +static struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen, + const struct pipe_resource *templ, + struct winsys_handle *whandle) { struct r600_common_screen *rscreen = (struct r600_common_screen*)screen; struct pb_buffer *buf = NULL; @@ -1071,10 +1071,16 @@ static void r600_texture_transfer_unmap(struct pipe_context *ctx, static const struct u_resource_vtbl r600_texture_vtbl = { - r600_texture_get_handle, /* get_handle */ + NULL, /* get_handle */ r600_texture_destroy, /* resource_destroy */ r600_texture_transfer_map, /* transfer_map */ NULL, /* transfer_flush_region */ r600_texture_transfer_unmap, /* transfer_unmap */ NULL /* transfer_inline_write */ }; + +void r600_init_texture_functions(struct r600_common_screen *rscreen) +{ + rscreen->b.resource_from_handle = r600_texture_from_handle; + rscreen->b.resource_get_handle = r600_texture_get_handle; +} diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources index 56295720f4d..c24eb75194b 100644 --- a/src/gallium/drivers/radeonsi/Makefile.sources +++ b/src/gallium/drivers/radeonsi/Makefile.sources @@ -7,7 +7,6 @@ C_SOURCES := \ si_hw_context.c \ si_pipe.c \ si_pm4.c \ - si_resource.c \ si_shader.c \ si_state.c \ si_state_draw.c \ diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 077706f4cf3..4879b2ff914 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -142,7 +142,6 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void * goto fail; si_init_blit_functions(sctx); - si_init_context_resource_functions(sctx); si_init_compute_functions(sctx); if (sscreen->b.info.has_uvd) { @@ -637,7 +636,6 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) sscreen->b.b.get_video_param = si_get_video_param; sscreen->b.b.is_video_format_supported = vl_video_buffer_is_format_supported; } - si_init_screen_resource_functions(&sscreen->b.b); if (!r600_common_screen_init(&sscreen->b, ws)) { FREE(sscreen); diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index ecc66993230..aa62852b093 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -176,9 +176,6 @@ void si_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence, unsigned flags); const char *si_get_llvm_processor_name(enum radeon_family family); -/* si_resource.c */ -void si_init_context_resource_functions(struct si_context *sctx); - /* si_translate.c */ void si_translate_index_buffer(struct si_context *sctx, struct pipe_index_buffer *ib, diff --git a/src/gallium/drivers/radeonsi/si_resource.c b/src/gallium/drivers/radeonsi/si_resource.c deleted file mode 100644 index c0f1e264ae4..00000000000 --- a/src/gallium/drivers/radeonsi/si_resource.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2010 Marek Olšák target == PIPE_BUFFER) { - return r600_buffer_create(screen, templ, 4096); - } else { - return r600_texture_create(screen, templ); - } -} - -static struct pipe_resource *si_resource_from_handle(struct pipe_screen * screen, - const struct pipe_resource *templ, - struct winsys_handle *whandle) -{ - if (templ->target == PIPE_BUFFER) { - return NULL; - } else { - return r600_texture_from_handle(screen, templ, whandle); - } -} - -void si_init_screen_resource_functions(struct pipe_screen *screen) -{ - screen->resource_create = si_resource_create; - screen->resource_from_handle = si_resource_from_handle; - screen->resource_get_handle = u_resource_get_handle_vtbl; - screen->resource_destroy = u_resource_destroy_vtbl; -} - -void si_init_context_resource_functions(struct si_context *sctx) -{ - sctx->b.b.transfer_map = u_transfer_map_vtbl; - sctx->b.b.transfer_flush_region = u_default_transfer_flush_region; - sctx->b.b.transfer_unmap = u_transfer_unmap_vtbl; - sctx->b.b.transfer_inline_write = u_default_transfer_inline_write; -} diff --git a/src/gallium/drivers/radeonsi/si_resource.h b/src/gallium/drivers/radeonsi/si_resource.h index 67da8faead8..a76419c7b2b 100644 --- a/src/gallium/drivers/radeonsi/si_resource.h +++ b/src/gallium/drivers/radeonsi/si_resource.h @@ -44,8 +44,6 @@ struct si_surface { struct pipe_surface base; }; -void si_init_screen_resource_functions(struct pipe_screen *screen); - struct si_context; void si_upload_const_buffer(struct si_context *sctx, struct r600_resource **rbuffer, -- 2.30.2