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

iris: have more than one const_offset

Browse source
This commit is contained in:
Kenneth Graunke 2018-06-06 14:14:31 -07:00
parent 9ea05ccf1f
commit 4e007dbb30
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/iris/iris_context.h
View file

@ -169,10 +169,13 @@ struct iris_compiled_shader {
uint8_t derived_data[0];
};
struct iris_const_buffer {
struct pipe_resource *res;
unsigned offset;
};
struct iris_shader_state {
struct pipe_constant_buffer constbuf[PIPE_MAX_CONSTANT_BUFFERS];
struct pipe_resource *const_resources[PIPE_MAX_CONSTANT_BUFFERS];
unsigned const_offset;
struct iris_const_buffer constbuf[PIPE_MAX_CONSTANT_BUFFERS];
};
struct iris_vtable {

16
src/gallium/drivers/iris/iris_state.c
View file

@ -1345,17 +1345,17 @@ iris_set_constant_buffer(struct pipe_context *ctx,
struct iris_context *ice = (struct iris_context *) ctx;
gl_shader_stage stage = stage_from_pipe(p_stage);
struct iris_shader_state *shs = &ice->shaders.state[stage];
struct iris_const_buffer *cbuf = &shs->constbuf[index];
if (input && (input->buffer || input->user_buffer)) {
if (input->user_buffer) {
u_upload_data(ctx->const_uploader, 0, input->buffer_size, 32,
input->user_buffer, &shs->const_offset,
&shs->const_resources[index]);
input->user_buffer, &cbuf->offset, &cbuf->res);
} else {
pipe_resource_reference(&shs->const_resources[index], input->buffer);
pipe_resource_reference(&cbuf->res, input->buffer);
}
} else {
pipe_resource_reference(&shs->const_resources[index], NULL);
pipe_resource_reference(&cbuf->res, NULL);
}
}
@ -2260,14 +2260,14 @@ iris_upload_render_state(struct iris_context *ice,
continue;
// XXX: is range->block a constbuf index? it would be nice
struct iris_resource *res =
(void *) shs->const_resources[range->block];
struct iris_const_buffer *cbuf = &shs->constbuf[range->block];
struct iris_resource *res = (void *) cbuf->res;
assert(shs->const_offset % 32 == 0);
assert(cbuf->offset % 32 == 0);
pkt.ConstantBody.ReadLength[n] = range->length;
pkt.ConstantBody.Buffer[n] =
ro_bo(res->bo, range->start * 32 + shs->const_offset);
ro_bo(res->bo, range->start * 32 + cbuf->offset);
n--;
}
}