From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 4 Jan 2015 13:41:49 +0000 (+0100)
Subject: radeonsi: fix VertexID for OpenGL
X-Git-Tag: upstream/17.1.0~21703
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7c6f397f44ae6a0ba63d8734b133196fe88443e;p=platform%2Fupstream%2Fmesa.git

radeonsi: fix VertexID for OpenGL

This fixes all failing piglit VertexID tests.

Cc: 10.4 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 1694490..e93708b 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -591,8 +591,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: