fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g,radeonsi: consolidate the contents of r600_resource.c

Browse source 
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Marek Olšák 2014-01-22 00:58:12 +01:00
parent 8739c60796
commit a9ae7635b7
13 changed files with 45 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/r600/Makefile.sources
View file

@ -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 \

13
src/gallium/drivers/r600/r600_pipe.c
View file

@ -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);

3
src/gallium/drivers/r600/r600_pipe.h
View file

@ -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,

76
src/gallium/drivers/r600/r600_resource.c
View file

@ -1,76 +0,0 @@
/*
* Copyright 2010 Marek Olšák <maraeo@gmail.com
*
* 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
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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 "r600_pipe.h"
#include "evergreen_compute.h"
static struct pipe_resource *r600_resource_create(struct pipe_screen *screen,
const struct pipe_resource *templ)
{
if (templ->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;
}

3
src/gallium/drivers/r600/r600_resource.h
View file

@ -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

19
src/gallium/drivers/radeon/r600_pipe_common.c
View file

@ -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);

6
src/gallium/drivers/radeon/r600_pipe_common.h
View file

@ -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. */

18
src/gallium/drivers/radeon/r600_texture.c
View file

@ -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;
}

1
src/gallium/drivers/radeonsi/Makefile.sources
View file

@ -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 \

2
src/gallium/drivers/radeonsi/si_pipe.c
View file

@ -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);

3
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -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,

61
src/gallium/drivers/radeonsi/si_resource.c
View file

@ -1,61 +0,0 @@
/*
* Copyright 2010 Marek Olšák <maraeo@gmail.com
*
* 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
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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 "si_pipe.h"
static struct pipe_resource *si_resource_create(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);
}
}
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;
}

2
src/gallium/drivers/radeonsi/si_resource.h
View file

@ -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,