Mesa (master): anv: Count surfaces for non-YCbCr images in GetDescriptorSetLayoutSupport

[GitLab Mirror]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Mar  1 14:01:08 2019 -0600

anv: Count surfaces for non-YCbCr images in GetDescriptorSetLayoutSupport

We were accidentally not counting those surfaces

Fixes: ddc4069122 "anv: Implement VK_KHR_maintenance3"
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/intel/vulkan/anv_descriptor_set.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index a4e466cf3dd..0df0c3825e5 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -58,6 +58,9 @@ void anv_GetDescriptorSetLayoutSupport(
                anv_foreach_stage(s, binding->stageFlags)
                   surface_count[s] += sampler->n_planes;
             }
+         } else {
+            anv_foreach_stage(s, binding->stageFlags)
+               surface_count[s] += binding->descriptorCount;
          }
          break;