summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2021-04-22 13:32:08 +0300
committerMarge Bot <eric+marge@anholt.net>2021-04-22 15:34:52 +0000
commitfab08d65cbdb9f487eccd3d135fe57b06afe6a00 (patch)
tree1122e34635ef560ba12e7e9664ce2224e3a24407
parent2b49d5d1930fdbd1293603c34ba952ab9bdf858f (diff)
anv: drop extension check for dynamic state
Following 505d176a8ebf ("anv: disable baked in pipeline bits from dynamic emission path") dynamic bits of extensions that are not enabled should not be there. Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10206>
-rw-r--r--src/intel/vulkan/gfx7_cmd_buffer.c3
-rw-r--r--src/intel/vulkan/gfx8_cmd_buffer.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/intel/vulkan/gfx7_cmd_buffer.c b/src/intel/vulkan/gfx7_cmd_buffer.c
index 559a484e2d2..cd0adf7b647 100644
--- a/src/intel/vulkan/gfx7_cmd_buffer.c
+++ b/src/intel/vulkan/gfx7_cmd_buffer.c
@@ -345,8 +345,7 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer)
cmd_buffer->state.gfx.primitive_topology = topology;
}
- if (cmd_buffer->device->vk.enabled_extensions.EXT_sample_locations &&
- cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) {
+ if (cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) {
genX(emit_multisample)(&cmd_buffer->batch,
cmd_buffer->state.gfx.dynamic.sample_locations.samples,
cmd_buffer->state.gfx.dynamic.sample_locations.locations);
diff --git a/src/intel/vulkan/gfx8_cmd_buffer.c b/src/intel/vulkan/gfx8_cmd_buffer.c
index dede0e4b7dc..c265563b680 100644
--- a/src/intel/vulkan/gfx8_cmd_buffer.c
+++ b/src/intel/vulkan/gfx8_cmd_buffer.c
@@ -648,8 +648,7 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer)
}
}
- if (cmd_buffer->device->vk.enabled_extensions.EXT_sample_locations &&
- cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) {
+ if (cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) {
genX(emit_sample_pattern)(&cmd_buffer->batch,
cmd_buffer->state.gfx.dynamic.sample_locations.samples,
cmd_buffer->state.gfx.dynamic.sample_locations.locations);