Mesa (main): radv: don't ever convert num_records to bytes if it's zero

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e4fbb200fc30fd8e16ed2014a9b37c9d18eac611
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4fbb200fc30fd8e16ed2014a9b37c9d18eac611

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Tue Jun 29 16:18:55 2021 +0100

radv: don't ever convert num_records to bytes if it's zero

If num_records==0, this conversion doesn't work. We should just keep it at
zero.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5007
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11642>

---

 src/amd/vulkan/radv_cmd_buffer.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 20e51f29a95..b73116accc5 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2911,7 +2911,10 @@ radv_flush_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer, bool pipeline_
             else
                num_records = (num_records - attrib_end) / stride + 1;
 
-            if ((chip == GFX8 && num_records) || (chip >= GFX10 && !stride))
+            /* GFX10 uses OOB_SELECT_RAW if stride==0, so convert num_records from elements into
+             * into bytes in that case. GFX8 always uses bytes.
+             */
+            if (num_records && (chip == GFX8 || (chip >= GFX10 && !stride)))
                num_records = (num_records - 1) * stride + attrib_end;
          } else {
             if (chip != GFX8 && stride)