fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: Plumb the shader into push constant helpers

Browse source 
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10571>
(cherry picked from commit 24b3e71fa9)
This commit is contained in:
Jason Ekstrand 2021-05-02 17:54:57 -05:00 • committed by Eric Engestrom
parent 88bd86baa0
commit 49f846f596
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -202,7 +202,7 @@
"description": "anv: Plumb the shader into push constant helpers", "description": "anv: Plumb the shader into push constant helpers",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": null "because_sha": null
}, },

18
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -2973,7 +2973,7 @@ cmd_buffer_emit_descriptor_pointers(struct anv_cmd_buffer *cmd_buffer,
static struct anv_address static struct anv_address
get_push_range_address(struct anv_cmd_buffer *cmd_buffer, get_push_range_address(struct anv_cmd_buffer *cmd_buffer,
gl_shader_stage stage, const struct anv_shader_bin *shader,
const struct anv_push_range *range) const struct anv_push_range *range)
{ {
struct anv_cmd_graphics_state *gfx_state = &cmd_buffer->state.gfx; struct anv_cmd_graphics_state *gfx_state = &cmd_buffer->state.gfx;
@ -3044,10 +3044,10 @@ get_push_range_address(struct anv_cmd_buffer *cmd_buffer,
*/ */
static uint32_t static uint32_t
get_push_range_bound_size(struct anv_cmd_buffer *cmd_buffer, get_push_range_bound_size(struct anv_cmd_buffer *cmd_buffer,
gl_shader_stage stage, const struct anv_shader_bin *shader,
const struct anv_push_range *range) const struct anv_push_range *range)
{ {
assert(stage != MESA_SHADER_COMPUTE); assert(shader->stage != MESA_SHADER_COMPUTE);
const struct anv_cmd_graphics_state *gfx_state = &cmd_buffer->state.gfx; const struct anv_cmd_graphics_state *gfx_state = &cmd_buffer->state.gfx;
switch (range->set) { switch (range->set) {
case ANV_DESCRIPTOR_SET_DESCRIPTORS: { case ANV_DESCRIPTOR_SET_DESCRIPTORS: {
@ -3273,8 +3273,8 @@ cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer,
if (!anv_pipeline_has_stage(pipeline, stage)) if (!anv_pipeline_has_stage(pipeline, stage))
continue; continue;
const struct anv_pipeline_bind_map *bind_map = const struct anv_shader_bin *shader = pipeline->shaders[stage];
&pipeline->shaders[stage]->bind_map; const struct anv_pipeline_bind_map *bind_map = &shader->bind_map;
struct anv_push_constants *push = &gfx_state->base.push_constants; struct anv_push_constants *push = &gfx_state->base.push_constants;
push->push_reg_mask[stage] = 0; push->push_reg_mask[stage] = 0;
@ -3288,7 +3288,7 @@ cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer,
continue; continue;
unsigned bound_size = unsigned bound_size =
get_push_range_bound_size(cmd_buffer, stage, range); get_push_range_bound_size(cmd_buffer, shader, range);
if (bound_size >= range->start * 32) { if (bound_size >= range->start * 32) {
unsigned bound_regs = unsigned bound_regs =
MIN2(DIV_ROUND_UP(bound_size, 32) - range->start, MIN2(DIV_ROUND_UP(bound_size, 32) - range->start,
@ -3318,8 +3318,8 @@ cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer,
struct anv_address buffers[4] = {}; struct anv_address buffers[4] = {};
if (anv_pipeline_has_stage(pipeline, stage)) { if (anv_pipeline_has_stage(pipeline, stage)) {
const struct anv_pipeline_bind_map *bind_map = const struct anv_shader_bin *shader = pipeline->shaders[stage];
&pipeline->shaders[stage]->bind_map; const struct anv_pipeline_bind_map *bind_map = &shader->bind_map;
/* We have to gather buffer addresses as a second step because the /* We have to gather buffer addresses as a second step because the
* loop above puts data into the push constant area and the call to * loop above puts data into the push constant area and the call to
@ -3333,7 +3333,7 @@ cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer,
if (range->length == 0) if (range->length == 0)
break; break;
buffers[i] = get_push_range_address(cmd_buffer, stage, range); buffers[i] = get_push_range_address(cmd_buffer, shader, range);
max_push_range = MAX2(max_push_range, range->length); max_push_range = MAX2(max_push_range, range->length);
buffer_count++; buffer_count++;
} }