Mesa (staging/18.2): radv: Revert divisor = 0 case for vertex attribute extension.

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: 3ff3bfa3f5fdfb5a9af5d5bc5f827682a181ab33
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ff3bfa3f5fdfb5a9af5d5bc5f827682a181ab33

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Wed Aug 15 16:28:24 2018 +0200

radv: Revert divisor = 0 case for vertex attribute extension.

Seems like DXVK depends on that and it might get reverted
upstream. Since apps are not supposed to use 0 in v2 anyway,
we should be safe implementing the old behavior there.

Fixes: 66e12451ac4 "radv: Update to new VK_EXT_vertex_attribute_divisor to version 2."
CC: 18.2 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
(cherry picked from commit 011a811652c74dcc9f56506ebb6075e4bdfe6ef9)

---

 src/amd/vulkan/radv_nir_to_llvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index bfd8b562e5..8bf3ae0f15 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -2006,7 +2006,7 @@ handle_vs_input_decl(struct radv_shader_context *ctx,
 						MAX2(1, ctx->shader_info->vs.vgpr_comp_cnt);
 				}
 			} else {
-				unreachable("Invalid vertex attribute divisor of 0.");
+				buffer_index = ctx->ac.i32_0;
 			}
 
 			buffer_index = LLVMBuildAdd(ctx->ac.builder, ctx->abi.start_instance, buffer_index, "");