Mesa (10.4): radeonsi: fix VertexID for OpenGL

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: 81f8006f7d6366f25bfc193a925f1b08471ed21f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=81f8006f7d6366f25bfc193a925f1b08471ed21f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Jan  4 14:41:49 2015 +0100

radeonsi: fix VertexID for OpenGL

This fixes all failing piglit VertexID tests.

Cc: 10.4 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
(cherry picked from commit d7c6f397f44ae6a0ba63d8734b133196fe88443e)

---

 src/gallium/drivers/radeonsi/si_shader.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 40a2f90..541e733 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -590,8 +590,11 @@ static void declare_system_value(
 		break;
 
 	case TGSI_SEMANTIC_VERTEXID:
-		value = LLVMGetParam(radeon_bld->main_fn,
-				     si_shader_ctx->param_vertex_id);
+		value = LLVMBuildAdd(gallivm->builder,
+				     LLVMGetParam(radeon_bld->main_fn,
+						  si_shader_ctx->param_vertex_id),
+				     LLVMGetParam(radeon_bld->main_fn,
+						  SI_PARAM_BASE_VERTEX), "");
 		break;
 
 	case TGSI_SEMANTIC_SAMPLEID: