diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index b1737f2d6b7..a6215c4a3ce 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -5153,10 +5153,6 @@ radv_compute_pipeline_compile(struct radv_compute_pipeline *pipeline,
    radv_nir_shader_info_pass(device, cs_stage.nir, MESA_SHADER_NONE, pipeline_layout, pipeline_key,
                              pipeline->base.type, false, &cs_stage.info);
 
-   /* Declare shader arguments. */
-   cs_stage.args.explicit_scratch_args = !radv_use_llvm_for_stage(device, MESA_SHADER_COMPUTE);
-   cs_stage.args.load_grid_size_from_user_sgpr = device->load_grid_size_from_user_sgpr;
-
    radv_declare_shader_args(device, pipeline_key, &cs_stage.info, MESA_SHADER_COMPUTE, false,
                             MESA_SHADER_VERTEX, RADV_SHADER_TYPE_DEFAULT, &cs_stage.args);
 
diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c
index e55b3070593..bbe9afdb173 100644
--- a/src/amd/vulkan/radv_pipeline_rt.c
+++ b/src/amd/vulkan/radv_pipeline_rt.c
@@ -266,10 +266,6 @@ radv_rt_pipeline_compile(struct radv_ray_tracing_pipeline *pipeline,
    radv_nir_shader_info_pass(device, rt_stage.nir, MESA_SHADER_NONE, pipeline_layout, pipeline_key,
                              pipeline->base.base.type, false, &rt_stage.info);
 
-   /* Declare shader arguments. */
-   rt_stage.args.explicit_scratch_args = !radv_use_llvm_for_stage(device, rt_stage.stage);
-   rt_stage.args.load_grid_size_from_user_sgpr = device->load_grid_size_from_user_sgpr;
-
    radv_declare_shader_args(device, pipeline_key, &rt_stage.info, rt_stage.stage, false,
                             MESA_SHADER_NONE, RADV_SHADER_TYPE_DEFAULT, &rt_stage.args);
 
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index c2ea28d7461..e3e6b685c4c 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -2283,7 +2283,6 @@ radv_create_trap_handler_shader(struct radv_device *device)
    info.wave_size = 64;
 
    struct radv_shader_args args;
-   args.explicit_scratch_args = true;
    radv_declare_shader_args(device, &key, &info, stage, false, MESA_SHADER_NONE,
                             RADV_SHADER_TYPE_TRAP_HANDLER, &args);
 
@@ -2355,7 +2354,6 @@ radv_create_rt_prolog(struct radv_device *device)
 
    struct radv_pipeline_key pipeline_key = {0};
 
-   in_args.explicit_scratch_args = true;
    radv_declare_shader_args(device, &pipeline_key, &info, MESA_SHADER_COMPUTE, false,
                             MESA_SHADER_NONE, RADV_SHADER_TYPE_DEFAULT, &in_args);
    radv_declare_rt_shader_args(options.gfx_level, &out_args);
@@ -2420,7 +2418,6 @@ radv_create_vs_prolog(struct radv_device *device, const struct radv_vs_prolog_ke
 
    struct radv_pipeline_key pipeline_key = {0};
 
-   args.explicit_scratch_args = true;
    radv_declare_shader_args(device, &pipeline_key, &info, key->next_stage,
                             key->next_stage != MESA_SHADER_VERTEX, MESA_SHADER_VERTEX,
                             RADV_SHADER_TYPE_DEFAULT, &args);