From ab252d73a9c295b9c93a6e4b527ec453ca053e8a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Sat, 27 Feb 2021 00:46:39 +0100 Subject: [PATCH] v3dv/pipeline: remove pipeline->use_push_constants In the past we used this boolean for several things, it is really superfluous right now. Reviewed-by: Iago Toral Quiroga Part-of: --- src/broadcom/vulkan/v3dv_pipeline.c | 1 - src/broadcom/vulkan/v3dv_private.h | 3 --- src/broadcom/vulkan/v3dv_uniforms.c | 1 - 3 files changed, 5 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 7ec4855..953066f 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -818,7 +818,6 @@ lower_intrinsic(nir_builder *b, nir_intrinsic_instr *instr, case nir_intrinsic_load_push_constant: lower_load_push_constant(b, instr, pipeline); - pipeline->use_push_constants = true; return true; case nir_intrinsic_vulkan_resource_index: diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h index a79f7d5..78ab256 100644 --- a/src/broadcom/vulkan/v3dv_private.h +++ b/src/broadcom/vulkan/v3dv_private.h @@ -1671,9 +1671,6 @@ struct v3dv_pipeline { /* If the pipeline should emit any of the stencil configuration packets */ bool emit_stencil_cfg[2]; - /* If the pipeline is using push constants */ - bool use_push_constants; - /* Blend state */ struct { /* Per-RT bit mask with blend enables */ diff --git a/src/broadcom/vulkan/v3dv_uniforms.c b/src/broadcom/vulkan/v3dv_uniforms.c index c1de7ed..e0eea03 100644 --- a/src/broadcom/vulkan/v3dv_uniforms.c +++ b/src/broadcom/vulkan/v3dv_uniforms.c @@ -343,7 +343,6 @@ v3dv_write_uniforms_wg_offsets(struct v3dv_cmd_buffer *cmd_buffer, break; case QUNIFORM_UNIFORM: - assert(pipeline->use_push_constants); cl_aligned_u32(&uniforms, cmd_buffer->push_constants_data[data]); break; -- 2.7.4