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

radeonsi: add si_get_shader_buffers/get_pipe_constant_buffers (v2) 

These functions extract the pipe state structure from the current
descriptors, for state saving.

v2: correctly dereference *buf (Bas)

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2016-09-14 09:45:37 +02:00
parent 8d45243e40
commit 70f9ca2468
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@ -837,6 +837,27 @@ static void si_buffer_resources_begin_new_cs(struct si_context *sctx,
}
}
static void si_get_buffer_from_descriptors(struct si_buffer_resources *buffers,
struct si_descriptors *descs,
unsigned idx, struct pipe_resource **buf,
unsigned *offset, unsigned *size)
{
pipe_resource_reference(buf, buffers->buffers[idx]);
if (*buf) {
struct r600_resource *res = r600_resource(*buf);
const uint32_t *desc = descs->list + idx * 4;
uint64_t va;
*size = desc[2];
assert(G_008F04_STRIDE(desc[1]) == 0);
va = ((uint64_t)desc[1] << 32) | desc[0];
assert(va >= res->gpu_address && va + *size <= res->gpu_address + res->bo_size);
*offset = va - res->gpu_address;
}
}
/* VERTEX BUFFERS */
static void si_vertex_buffers_begin_new_cs(struct si_context *sctx)
@ -1062,6 +1083,16 @@ static void si_pipe_set_constant_buffer(struct pipe_context *ctx,
slot, input);
}
void si_get_pipe_constant_buffer(struct si_context *sctx, uint shader,
uint slot, struct pipe_constant_buffer *cbuf)
{
cbuf->user_buffer = NULL;
si_get_buffer_from_descriptors(
&sctx->const_buffers[shader],
si_const_buffer_descriptors(sctx, shader),
slot, &cbuf->buffer, &cbuf->buffer_offset, &cbuf->buffer_size);
}
/* SHADER BUFFERS */
static unsigned
@ -1132,6 +1163,21 @@ static void si_set_shader_buffers(struct pipe_context *ctx,
}
}
void si_get_shader_buffers(struct si_context *sctx, uint shader,
uint start_slot, uint count,
struct pipe_shader_buffer *sbuf)
{
struct si_buffer_resources *buffers = &sctx->shader_buffers[shader];
struct si_descriptors *descs = si_shader_buffer_descriptors(sctx, shader);
for (unsigned i = 0; i < count; ++i) {
si_get_buffer_from_descriptors(
buffers, descs, start_slot + i,
&sbuf[i].buffer, &sbuf[i].buffer_offset,
&sbuf[i].buffer_size);
}
}
/* RING BUFFERS */
void si_set_ring_buffer(struct pipe_context *ctx, uint slot,

5
src/gallium/drivers/radeonsi/si_state.h
View File

@ -281,6 +281,11 @@ void si_set_mutable_tex_desc_fields(struct r600_texture *tex,
unsigned base_level, unsigned first_level,
unsigned block_width, bool is_stencil,
uint32_t *state);
void si_get_pipe_constant_buffer(struct si_context *sctx, uint shader,
uint slot, struct pipe_constant_buffer *cbuf);
void si_get_shader_buffers(struct si_context *sctx, uint shader,
uint start_slot, uint count,
struct pipe_shader_buffer *sbuf);
void si_set_ring_buffer(struct pipe_context *ctx, uint slot,
struct pipe_resource *buffer,
unsigned stride, unsigned num_records,