Mesa (master): anv: fix missing general state pool in validation list

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 0f437e49c60f007abf3605cb4438db372f1503a0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f437e49c60f007abf3605cb4438db372f1503a0

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Wed Mar  3 15:21:55 2021 +0200

anv: fix missing general state pool in validation list

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: 83fee30e85965c ("anv: allow multiple command buffers in anv_queue_submit")
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9388>

---

 src/intel/vulkan/anv_batch_chain.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c
index 26144f550a8..7b7d6eddacc 100644
--- a/src/intel/vulkan/anv_batch_chain.c
+++ b/src/intel/vulkan/anv_batch_chain.c
@@ -1647,6 +1647,13 @@ setup_execbuf_for_cmd_buffers(struct anv_execbuf *execbuf,
             return result;
       }
 
+      pool = &device->general_state_pool.block_pool;
+      anv_block_pool_foreach_bo(bo, pool) {
+         result = anv_execbuf_add_bo(device, execbuf, bo, NULL, 0);
+         if (result != VK_SUCCESS)
+            return result;
+      }
+
       pool = &device->instruction_state_pool.block_pool;
       anv_block_pool_foreach_bo(bo, pool) {
          result = anv_execbuf_add_bo(device, execbuf, bo, NULL, 0);