summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/intel/vulkan/anv_private.h1
-rw-r--r--src/intel/vulkan/genX_blorp_exec.c7
-rw-r--r--src/intel/vulkan/genX_pipeline.c6
3 files changed, 3 insertions, 11 deletions
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 1916104197a..f1875aa7642 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -2747,7 +2747,6 @@ struct anv_pipeline {
struct {
const struct gen_l3_config * l3_config;
uint32_t total_size;
- unsigned entry_size[4];
} urb;
VkShaderStageFlags active_stages;
diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index 852353cab2a..1592e7f7e3d 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -202,13 +202,6 @@ blorp_emit_urb_config(struct blorp_batch *batch,
assert(sf_entry_size == 0);
- /* If the last used gfx pipeline in the command buffer has enough VS URB
- * space for what the blorp operation needs, skip reconfiguration.
- */
- if (cmd_buffer->state.gfx.base.pipeline &&
- cmd_buffer->state.gfx.base.pipeline->urb.entry_size[MESA_SHADER_VERTEX] >= vs_entry_size)
- return;
-
const unsigned entry_size[4] = { vs_entry_size, 1, 1, 1 };
genX(emit_urb_setup)(device, &cmd_buffer->batch,
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index f2b7faca4a2..0b58dce05b0 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -308,18 +308,18 @@ genX(emit_urb_setup)(struct anv_device *device, struct anv_batch *batch,
static void
emit_urb_setup(struct anv_pipeline *pipeline)
{
+ unsigned entry_size[4];
for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_GEOMETRY; i++) {
const struct brw_vue_prog_data *prog_data =
!anv_pipeline_has_stage(pipeline, i) ? NULL :
(const struct brw_vue_prog_data *) pipeline->shaders[i]->prog_data;
- pipeline->urb.entry_size[i] = prog_data ? prog_data->urb_entry_size : 1;
+ entry_size[i] = prog_data ? prog_data->urb_entry_size : 1;
}
genX(emit_urb_setup)(pipeline->device, &pipeline->batch,
pipeline->urb.l3_config,
- pipeline->active_stages,
- pipeline->urb.entry_size);
+ pipeline->active_stages, entry_size);
}
static void