Mesa (master): v3dv: properly handle two different binding points for cmd_buffers
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jan 22 10:58:38 UTC 2021
Module: Mesa
Branch: master
Commit: a346e1dea039560baa7bec4050cb60a9f29e558c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a346e1dea039560baa7bec4050cb60a9f29e558c
Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date: Fri Jan 15 23:07:45 2021 +0100
v3dv: properly handle two different binding points for cmd_buffers
>From vkCmdBindPipeline spec:
"pipelineBindPoint is a VkPipelineBindPoint value specifying to
which bind point the pipeline is bound. Binding one does not disturb
the others."
But internally we were only handling one pipeline per command buffer,
so binding a pipeline of one type would override an alredy bound
pipeline of other type.
Note that for push constants, in the same way that we were keeping one
client array and one bo for the values, for all stages, independently
of the stageFlags specified by vkCmdPushConstants, we are keeping the
same idea here, so such client array and bo is still tied to the
command buffer, and used by the two pipeline bind points. That makes
far easier tracking the push constants. We could revisit in the future
if we want a more fine grained tracking.
Fixes the following crashes:
dEQP-VK.pipeline.push_constant.lifetime.pipeline_change_diff_range_bind_push_vert_and_comp
dEQP-VK.pipeline.push_constant.lifetime.pipeline_change_same_range_bind_push_vert_and_comp
v2 (from Iago review)
* Move removal of v3dv_resource definition to a different commit.
* Use the new v3dv_cmd_pipeline_state on the cmd buffer meta
sub-struct, call it gfx for consistency
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8613>
---
src/broadcom/vulkan/v3dv_cmd_buffer.c | 93 ++++++++++++++++++-----------------
src/broadcom/vulkan/v3dv_private.h | 47 +++++++++++++-----
src/broadcom/vulkan/v3dv_uniforms.c | 15 +++---
3 files changed, 89 insertions(+), 66 deletions(-)
diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c
index 4e866b8dbab..93de64c2752 100644
--- a/src/broadcom/vulkan/v3dv_cmd_buffer.c
+++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c
@@ -3118,7 +3118,7 @@ bind_graphics_pipeline(struct v3dv_cmd_buffer *cmd_buffer,
struct v3dv_pipeline *pipeline)
{
assert(pipeline && !(pipeline->active_stages & VK_SHADER_STAGE_COMPUTE_BIT));
- if (cmd_buffer->state.pipeline == pipeline)
+ if (cmd_buffer->state.gfx.pipeline == pipeline)
return;
/* Enable always flush if we are blending to sRGB render targets. This
@@ -3140,7 +3140,7 @@ bind_graphics_pipeline(struct v3dv_cmd_buffer *cmd_buffer,
"uses sRGB blending\n", cmd_buffer->state.subpass_idx);
}
- cmd_buffer->state.pipeline = pipeline;
+ cmd_buffer->state.gfx.pipeline = pipeline;
cmd_buffer_bind_pipeline_static_state(cmd_buffer, &pipeline->dynamic_state);
@@ -3153,11 +3153,11 @@ bind_compute_pipeline(struct v3dv_cmd_buffer *cmd_buffer,
{
assert(pipeline && pipeline->active_stages == VK_SHADER_STAGE_COMPUTE_BIT);
- if (cmd_buffer->state.pipeline == pipeline)
+ if (cmd_buffer->state.compute.pipeline == pipeline)
return;
- cmd_buffer->state.pipeline = pipeline;
- cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_PIPELINE;
+ cmd_buffer->state.compute.pipeline = pipeline;
+ cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_COMPUTE_PIPELINE;
}
void
@@ -3410,7 +3410,7 @@ emit_stencil(struct v3dv_cmd_buffer *cmd_buffer)
struct v3dv_job *job = cmd_buffer->state.job;
assert(job);
- struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
struct v3dv_dynamic_state *dynamic_state = &cmd_buffer->state.dynamic;
const uint32_t dynamic_stencil_states = V3DV_DYNAMIC_STENCIL_COMPARE_MASK |
@@ -3463,7 +3463,7 @@ emit_stencil(struct v3dv_cmd_buffer *cmd_buffer)
static void
emit_depth_bias(struct v3dv_cmd_buffer *cmd_buffer)
{
- struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
assert(pipeline);
if (!pipeline->depth_bias.enabled)
@@ -3505,7 +3505,7 @@ emit_line_width(struct v3dv_cmd_buffer *cmd_buffer)
static void
emit_sample_state(struct v3dv_cmd_buffer *cmd_buffer)
{
- struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
assert(pipeline);
struct v3dv_job *job = cmd_buffer->state.job;
@@ -3526,7 +3526,7 @@ emit_blend(struct v3dv_cmd_buffer *cmd_buffer)
struct v3dv_job *job = cmd_buffer->state.job;
assert(job);
- struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
assert(pipeline);
const uint32_t blend_packets_size =
@@ -3664,7 +3664,7 @@ static void
emit_varyings_state(struct v3dv_cmd_buffer *cmd_buffer)
{
struct v3dv_job *job = cmd_buffer->state.job;
- struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
struct v3d_fs_prog_data *prog_data_fs =
pipeline->fs->current_variant->prog_data.fs;
@@ -3709,7 +3709,7 @@ emit_configuration_bits(struct v3dv_cmd_buffer *cmd_buffer)
struct v3dv_job *job = cmd_buffer->state.job;
assert(job);
- struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
assert(pipeline);
job_update_ez_state(job, pipeline, cmd_buffer);
@@ -3725,8 +3725,8 @@ emit_configuration_bits(struct v3dv_cmd_buffer *cmd_buffer)
}
static void
-update_uniform_state(struct v3dv_cmd_buffer *cmd_buffer,
- uint32_t dirty_uniform_state)
+update_gfx_uniform_state(struct v3dv_cmd_buffer *cmd_buffer,
+ uint32_t dirty_uniform_state)
{
/* We need to update uniform streams if any piece of state that is passed
* to the shader as a uniform may have changed.
@@ -3735,7 +3735,7 @@ update_uniform_state(struct v3dv_cmd_buffer *cmd_buffer,
* for shader stages that don't access descriptors.
*/
- struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
assert(pipeline);
const bool dirty_descriptors_only =
@@ -3771,7 +3771,7 @@ emit_gl_shader_state(struct v3dv_cmd_buffer *cmd_buffer)
assert(job);
struct v3dv_cmd_buffer_state *state = &cmd_buffer->state;
- struct v3dv_pipeline *pipeline = state->pipeline;
+ struct v3dv_pipeline *pipeline = state->gfx.pipeline;
assert(pipeline);
/* Update the cache dirty flag based on the shader progs data */
@@ -3987,18 +3987,19 @@ v3dv_cmd_buffer_meta_state_push(struct v3dv_cmd_buffer *cmd_buffer,
memcpy(&state->meta.render_area, &state->render_area, sizeof(VkRect2D));
}
- state->meta.pipeline = v3dv_pipeline_to_handle(state->pipeline);
+ /* We expect that meta operations are graphics-only, so we only take into
+ * account the graphics pipeline, and the graphics state
+ */
+ state->meta.gfx.pipeline = state->gfx.pipeline;
memcpy(&state->meta.dynamic, &state->dynamic, sizeof(state->dynamic));
- /* We expect that meta operations are graphics-only and won't alter
- * compute state.
- */
struct v3dv_descriptor_state *gfx_descriptor_state =
- &state->descriptor_state[VK_PIPELINE_BIND_POINT_GRAPHICS];
+ &cmd_buffer->state.gfx.descriptor_state;
+
if (push_descriptor_state) {
if (gfx_descriptor_state->valid != 0) {
- memcpy(&state->meta.descriptor_state, gfx_descriptor_state,
- sizeof(state->descriptor_state));
+ memcpy(&state->meta.gfx.descriptor_state, gfx_descriptor_state,
+ sizeof(state->gfx.descriptor_state));
}
state->meta.has_descriptor_state = true;
} else {
@@ -4048,16 +4049,15 @@ v3dv_cmd_buffer_meta_state_pop(struct v3dv_cmd_buffer *cmd_buffer,
state->subpass_idx = -1;
}
- if (state->meta.pipeline != VK_NULL_HANDLE) {
- struct v3dv_pipeline *pipeline =
- v3dv_pipeline_from_handle(state->meta.pipeline);
+ if (state->meta.gfx.pipeline != NULL) {
+ struct v3dv_pipeline *pipeline = state->meta.gfx.pipeline;
VkPipelineBindPoint pipeline_binding =
v3dv_pipeline_get_binding_point(pipeline);
v3dv_CmdBindPipeline(v3dv_cmd_buffer_to_handle(cmd_buffer),
pipeline_binding,
- state->meta.pipeline);
+ v3dv_pipeline_to_handle(state->meta.gfx.pipeline));
} else {
- state->pipeline = VK_NULL_HANDLE;
+ state->gfx.pipeline = NULL;
}
if (dirty_dynamic_state) {
@@ -4066,19 +4066,18 @@ v3dv_cmd_buffer_meta_state_pop(struct v3dv_cmd_buffer *cmd_buffer,
}
if (state->meta.has_descriptor_state) {
- if (state->meta.descriptor_state.valid != 0) {
- memcpy(&state->descriptor_state[VK_PIPELINE_BIND_POINT_GRAPHICS],
- &state->meta.descriptor_state,
- sizeof(state->descriptor_state));
+ if (state->meta.gfx.descriptor_state.valid != 0) {
+ memcpy(&state->gfx.descriptor_state, &state->meta.gfx.descriptor_state,
+ sizeof(state->gfx.descriptor_state));
} else {
- state->descriptor_state[VK_PIPELINE_BIND_POINT_GRAPHICS].valid = 0;
+ state->gfx.descriptor_state.valid = 0;
}
}
memcpy(cmd_buffer->push_constants_data, state->meta.push_constants,
sizeof(state->meta.push_constants));
- state->meta.pipeline = VK_NULL_HANDLE;
+ state->meta.gfx.pipeline = NULL;
state->meta.framebuffer = VK_NULL_HANDLE;
state->meta.pass = VK_NULL_HANDLE;
state->meta.subpass_idx = -1;
@@ -4125,7 +4124,7 @@ cmd_buffer_emit_draw(struct v3dv_cmd_buffer *cmd_buffer,
assert(job);
struct v3dv_cmd_buffer_state *state = &cmd_buffer->state;
- struct v3dv_pipeline *pipeline = state->pipeline;
+ struct v3dv_pipeline *pipeline = state->gfx.pipeline;
assert(pipeline);
@@ -4232,7 +4231,7 @@ cmd_buffer_restart_job_for_msaa_if_needed(struct v3dv_cmd_buffer *cmd_buffer)
/* We only need to restart the frame if the pipeline requires MSAA but
* our frame tiling didn't enable it.
*/
- if (!cmd_buffer->state.pipeline->msaa ||
+ if (!cmd_buffer->state.gfx.pipeline->msaa ||
cmd_buffer->state.job->frame_tiling.msaa) {
return;
}
@@ -4277,8 +4276,8 @@ cmd_buffer_restart_job_for_msaa_if_needed(struct v3dv_cmd_buffer *cmd_buffer)
static void
cmd_buffer_emit_pre_draw(struct v3dv_cmd_buffer *cmd_buffer)
{
- assert(cmd_buffer->state.pipeline);
- assert(!(cmd_buffer->state.pipeline->active_stages & VK_SHADER_STAGE_COMPUTE_BIT));
+ assert(cmd_buffer->state.gfx.pipeline);
+ assert(!(cmd_buffer->state.gfx.pipeline->active_stages & VK_SHADER_STAGE_COMPUTE_BIT));
/* If we emitted a pipeline barrier right before this draw we won't have
* an active job. In that case, create a new job continuing the current
@@ -4315,7 +4314,7 @@ cmd_buffer_emit_pre_draw(struct v3dv_cmd_buffer *cmd_buffer)
V3DV_CMD_DIRTY_VIEWPORT);
if (dirty_uniform_state)
- update_uniform_state(cmd_buffer, dirty_uniform_state);
+ update_gfx_uniform_state(cmd_buffer, dirty_uniform_state);
if (dirty_uniform_state || (*dirty & V3DV_CMD_DIRTY_VERTEX_BUFFER))
emit_gl_shader_state(cmd_buffer);
@@ -4398,7 +4397,7 @@ v3dv_CmdDrawIndexed(VkCommandBuffer commandBuffer,
struct v3dv_job *job = cmd_buffer->state.job;
assert(job);
- const struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ const struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
uint32_t hw_prim_type = v3d_hw_prim_type(pipeline->vs->topology);
uint8_t index_type = ffs(cmd_buffer->state.index_buffer.index_size) - 1;
uint32_t index_offset = firstIndex * cmd_buffer->state.index_buffer.index_size;
@@ -4461,7 +4460,7 @@ v3dv_CmdDrawIndirect(VkCommandBuffer commandBuffer,
struct v3dv_job *job = cmd_buffer->state.job;
assert(job);
- const struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ const struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
uint32_t hw_prim_type = v3d_hw_prim_type(pipeline->vs->topology);
v3dv_cl_ensure_space_with_branch(
@@ -4496,7 +4495,7 @@ v3dv_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer,
struct v3dv_job *job = cmd_buffer->state.job;
assert(job);
- const struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ const struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
uint32_t hw_prim_type = v3d_hw_prim_type(pipeline->vs->topology);
uint8_t index_type = ffs(cmd_buffer->state.index_buffer.index_size) - 1;
@@ -4736,7 +4735,9 @@ v3dv_CmdBindDescriptorSets(VkCommandBuffer commandBuffer,
assert(firstSet + descriptorSetCount <= MAX_SETS);
struct v3dv_descriptor_state *descriptor_state =
- &cmd_buffer->state.descriptor_state[pipelineBindPoint];
+ pipelineBindPoint == VK_PIPELINE_BIND_POINT_COMPUTE ?
+ &cmd_buffer->state.compute.descriptor_state :
+ &cmd_buffer->state.gfx.descriptor_state;
bool descriptor_state_changed = false;
for (uint32_t i = 0; i < descriptorSetCount; i++) {
@@ -5113,11 +5114,11 @@ v3dv_CmdWriteTimestamp(VkCommandBuffer commandBuffer,
static void
cmd_buffer_emit_pre_dispatch(struct v3dv_cmd_buffer *cmd_buffer)
{
- assert(cmd_buffer->state.pipeline);
- assert(cmd_buffer->state.pipeline->active_stages == VK_SHADER_STAGE_COMPUTE_BIT);
+ assert(cmd_buffer->state.compute.pipeline);
+ assert(cmd_buffer->state.compute.pipeline->active_stages == VK_SHADER_STAGE_COMPUTE_BIT);
uint32_t *dirty = &cmd_buffer->state.dirty;
- *dirty &= ~(V3DV_CMD_DIRTY_PIPELINE |
+ *dirty &= ~(V3DV_CMD_DIRTY_COMPUTE_PIPELINE |
V3DV_CMD_DIRTY_COMPUTE_DESCRIPTOR_SETS);
}
@@ -5189,7 +5190,7 @@ cmd_buffer_create_csd_job(struct v3dv_cmd_buffer *cmd_buffer,
uint32_t **wg_uniform_offsets_out,
uint32_t *wg_size_out)
{
- struct v3dv_pipeline *pipeline = cmd_buffer->state.pipeline;
+ struct v3dv_pipeline *pipeline = cmd_buffer->state.compute.pipeline;
assert(pipeline && pipeline->cs && pipeline->cs->nir);
struct v3dv_job *job = vk_zalloc(&cmd_buffer->device->vk.alloc,
diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index 878a5c7c28e..6d70bf0fd8c 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -705,15 +705,16 @@ enum v3dv_cmd_dirty_bits {
V3DV_CMD_DIRTY_STENCIL_WRITE_MASK = 1 << 3,
V3DV_CMD_DIRTY_STENCIL_REFERENCE = 1 << 4,
V3DV_CMD_DIRTY_PIPELINE = 1 << 5,
- V3DV_CMD_DIRTY_VERTEX_BUFFER = 1 << 6,
- V3DV_CMD_DIRTY_INDEX_BUFFER = 1 << 7,
- V3DV_CMD_DIRTY_DESCRIPTOR_SETS = 1 << 8,
- V3DV_CMD_DIRTY_COMPUTE_DESCRIPTOR_SETS = 1 << 9,
- V3DV_CMD_DIRTY_PUSH_CONSTANTS = 1 << 10,
- V3DV_CMD_DIRTY_BLEND_CONSTANTS = 1 << 11,
- V3DV_CMD_DIRTY_OCCLUSION_QUERY = 1 << 12,
- V3DV_CMD_DIRTY_DEPTH_BIAS = 1 << 13,
- V3DV_CMD_DIRTY_LINE_WIDTH = 1 << 14,
+ V3DV_CMD_DIRTY_COMPUTE_PIPELINE = 1 << 6,
+ V3DV_CMD_DIRTY_VERTEX_BUFFER = 1 << 7,
+ V3DV_CMD_DIRTY_INDEX_BUFFER = 1 << 8,
+ V3DV_CMD_DIRTY_DESCRIPTOR_SETS = 1 << 9,
+ V3DV_CMD_DIRTY_COMPUTE_DESCRIPTOR_SETS = 1 << 10,
+ V3DV_CMD_DIRTY_PUSH_CONSTANTS = 1 << 11,
+ V3DV_CMD_DIRTY_BLEND_CONSTANTS = 1 << 12,
+ V3DV_CMD_DIRTY_OCCLUSION_QUERY = 1 << 13,
+ V3DV_CMD_DIRTY_DEPTH_BIAS = 1 << 14,
+ V3DV_CMD_DIRTY_LINE_WIDTH = 1 << 15,
};
struct v3dv_dynamic_state {
@@ -974,6 +975,12 @@ struct v3dv_descriptor_state {
uint32_t dynamic_offsets[MAX_DYNAMIC_BUFFERS];
};
+struct v3dv_cmd_pipeline_state {
+ struct v3dv_pipeline *pipeline;
+
+ struct v3dv_descriptor_state descriptor_state;
+};
+
struct v3dv_cmd_buffer_state {
struct v3dv_render_pass *pass;
struct v3dv_framebuffer *framebuffer;
@@ -984,8 +991,8 @@ struct v3dv_cmd_buffer_state {
uint32_t subpass_idx;
- struct v3dv_pipeline *pipeline;
- struct v3dv_descriptor_state descriptor_state[2];
+ struct v3dv_cmd_pipeline_state gfx;
+ struct v3dv_cmd_pipeline_state compute;
struct v3dv_dynamic_state dynamic;
uint32_t dirty;
@@ -1041,7 +1048,6 @@ struct v3dv_cmd_buffer_state {
struct {
uint32_t subpass_idx;
VkRenderPass pass;
- VkPipeline pipeline;
VkFramebuffer framebuffer;
uint32_t attachment_alloc_count;
@@ -1053,7 +1059,7 @@ struct v3dv_cmd_buffer_state {
struct v3dv_dynamic_state dynamic;
- struct v3dv_descriptor_state descriptor_state;
+ struct v3dv_cmd_pipeline_state gfx;
bool has_descriptor_state;
uint32_t push_constants[MAX_PUSH_CONSTANTS_SIZE / 4];
@@ -1187,6 +1193,11 @@ struct v3dv_cmd_buffer {
struct v3dv_cmd_buffer_state state;
+ /* FIXME: we have just one client-side and bo for the push constants,
+ * independently of the stageFlags in vkCmdPushConstants, and the
+ * pipelineBindPoint in vkCmdBindPipeline. We could probably do more stage
+ * tunning in the future if it makes sense.
+ */
uint32_t push_constants_data[MAX_PUSH_CONSTANTS_SIZE / 4];
struct v3dv_cl_reloc push_constants_resource;
@@ -1741,6 +1752,16 @@ v3dv_pipeline_get_binding_point(struct v3dv_pipeline *pipeline)
VK_PIPELINE_BIND_POINT_COMPUTE : VK_PIPELINE_BIND_POINT_GRAPHICS;
}
+static inline struct v3dv_descriptor_state*
+v3dv_cmd_buffer_get_descriptor_state(struct v3dv_cmd_buffer *cmd_buffer,
+ struct v3dv_pipeline *pipeline)
+{
+ if (v3dv_pipeline_get_binding_point(pipeline) == VK_PIPELINE_BIND_POINT_COMPUTE)
+ return &cmd_buffer->state.compute.descriptor_state;
+ else
+ return &cmd_buffer->state.gfx.descriptor_state;
+}
+
const nir_shader_compiler_options *v3dv_pipeline_get_nir_options(void);
static inline uint32_t
diff --git a/src/broadcom/vulkan/v3dv_uniforms.c b/src/broadcom/vulkan/v3dv_uniforms.c
index 95e933d0db8..c1de7ed9228 100644
--- a/src/broadcom/vulkan/v3dv_uniforms.c
+++ b/src/broadcom/vulkan/v3dv_uniforms.c
@@ -40,10 +40,11 @@
* we need to rely on a UBO.
*/
static void
-check_push_constants_ubo(struct v3dv_cmd_buffer *cmd_buffer)
+check_push_constants_ubo(struct v3dv_cmd_buffer *cmd_buffer,
+ struct v3dv_pipeline *pipeline)
{
if (!(cmd_buffer->state.dirty & V3DV_CMD_DIRTY_PUSH_CONSTANTS) ||
- cmd_buffer->state.pipeline->layout->push_constant_size == 0)
+ pipeline->layout->push_constant_size == 0)
return;
if (cmd_buffer->push_constants_resource.bo == NULL) {
@@ -92,7 +93,7 @@ write_tmu_p0(struct v3dv_cmd_buffer *cmd_buffer,
uint32_t texture_idx = v3d_unit_data_get_unit(data);
struct v3dv_job *job = cmd_buffer->state.job;
struct v3dv_descriptor_state *descriptor_state =
- &cmd_buffer->state.descriptor_state[v3dv_pipeline_get_binding_point(pipeline)];
+ v3dv_cmd_buffer_get_descriptor_state(cmd_buffer, pipeline);
/* We need to ensure that the texture bo is added to the job */
struct v3dv_bo *texture_bo =
@@ -123,7 +124,7 @@ write_tmu_p1(struct v3dv_cmd_buffer *cmd_buffer,
uint32_t sampler_idx = v3d_unit_data_get_unit(data);
struct v3dv_job *job = cmd_buffer->state.job;
struct v3dv_descriptor_state *descriptor_state =
- &cmd_buffer->state.descriptor_state[v3dv_pipeline_get_binding_point(pipeline)];
+ v3dv_cmd_buffer_get_descriptor_state(cmd_buffer, pipeline);
assert(sampler_idx != V3DV_NO_SAMPLER_16BIT_IDX &&
sampler_idx != V3DV_NO_SAMPLER_32BIT_IDX);
@@ -162,7 +163,7 @@ write_ubo_ssbo_uniforms(struct v3dv_cmd_buffer *cmd_buffer,
{
struct v3dv_job *job = cmd_buffer->state.job;
struct v3dv_descriptor_state *descriptor_state =
- &cmd_buffer->state.descriptor_state[v3dv_pipeline_get_binding_point(pipeline)];
+ v3dv_cmd_buffer_get_descriptor_state(cmd_buffer, pipeline);
struct v3dv_descriptor_map *map =
content == QUNIFORM_UBO_ADDR || content == QUNIFORM_GET_UBO_SIZE ?
@@ -183,7 +184,7 @@ write_ubo_ssbo_uniforms(struct v3dv_cmd_buffer *cmd_buffer,
* updated. It already take into account it is should do the
* update or not
*/
- check_push_constants_ubo(cmd_buffer);
+ check_push_constants_ubo(cmd_buffer, pipeline);
struct v3dv_cl_reloc *resource =
&cmd_buffer->push_constants_resource;
@@ -280,7 +281,7 @@ get_texture_size(struct v3dv_cmd_buffer *cmd_buffer,
{
uint32_t texture_idx = v3d_unit_data_get_unit(data);
struct v3dv_descriptor_state *descriptor_state =
- &cmd_buffer->state.descriptor_state[v3dv_pipeline_get_binding_point(pipeline)];
+ v3dv_cmd_buffer_get_descriptor_state(cmd_buffer, pipeline);
struct v3dv_descriptor *descriptor =
v3dv_descriptor_map_get_descriptor(descriptor_state,
More information about the mesa-commit
mailing list