AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: remove r600_pipe_common::rebind_buffer

Browse Source 
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Marek Olšák
2018-04-01 14:04:04 -04:00
parent fbf1bf9b8f
commit 898500c440
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeon/r600_buffer_common.c
+1 -2
View File
@@ -288,7 +288,6 @@ void si_replace_buffer_storage(struct pipe_context *ctx,
struct pipe_resource *dst,
struct pipe_resource *src)
{
struct r600_common_context *rctx = (struct r600_common_context *)ctx;
struct r600_resource *rdst = r600_resource(dst);
struct r600_resource *rsrc = r600_resource(src);
uint64_t old_gpu_address = rdst->gpu_address;
@@ -306,7 +305,7 @@ void si_replace_buffer_storage(struct pipe_context *ctx,
assert(rdst->bo_alignment == rsrc->bo_alignment);
assert(rdst->domains == rsrc->domains);
rctx->rebind_buffer(ctx, dst, old_gpu_address);
si_rebind_buffer(ctx, dst, old_gpu_address);
}
static void si_invalidate_resource(struct pipe_context *ctx,
src/gallium/drivers/radeon/r600_pipe_common.h
-6
View File
@@ -499,12 +499,6 @@ struct r600_common_context {
/* Reallocate the buffer and update all resource bindings where
* the buffer is bound, including all resource descriptors. */
void (*invalidate_buffer)(struct pipe_context *ctx, struct pipe_resource *buf);
/* Update all resource bindings where the buffer is bound, including
* all resource descriptors. This is invalidate_buffer without
* the invalidation. */
void (*rebind_buffer)(struct pipe_context *ctx, struct pipe_resource *buf,
uint64_t old_gpu_address);
};
/* r600_buffer_common.c */
src/gallium/drivers/radeonsi/si_descriptors.c
+5 -3
View File
@@ -1610,8 +1610,11 @@ static void si_reset_buffer_resources(struct si_context *sctx,
}
}
static void si_rebind_buffer(struct pipe_context *ctx, struct pipe_resource *buf,
uint64_t old_va)
/* Update all resource bindings where the buffer is bound, including
* all resource descriptors. This is invalidate_buffer without
* the invalidation. */
void si_rebind_buffer(struct pipe_context *ctx, struct pipe_resource *buf,
uint64_t old_va)
{
struct si_context *sctx = (struct si_context*)ctx;
struct r600_resource *rbuffer = r600_resource(buf);
@@ -2784,7 +2787,6 @@ void si_init_all_descriptors(struct si_context *sctx)
sctx->b.b.delete_image_handle = si_delete_image_handle;
sctx->b.b.make_image_handle_resident = si_make_image_handle_resident;
sctx->b.invalidate_buffer = si_invalidate_buffer;
sctx->b.rebind_buffer = si_rebind_buffer;
/* Shader user data. */
si_init_atom(sctx, &sctx->shader_pointers.atom, &sctx->atoms.s.shader_pointers,
src/gallium/drivers/radeonsi/si_state.h
+2 -1
View File
@@ -369,7 +369,8 @@ struct pb_slab *si_bindless_descriptor_slab_alloc(void *priv, unsigned heap,
unsigned entry_size,
unsigned group_index);
void si_bindless_descriptor_slab_free(void *priv, struct pb_slab *pslab);
void si_rebind_buffer(struct pipe_context *ctx, struct pipe_resource *buf,
uint64_t old_va);
/* si_state.c */
struct si_shader_selector;