From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 22 Feb 2015 15:07:04 +0000 (+0100)
Subject: radeonsi: update si_get_vs_info and si_get_vs_state for tessellation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aa2fa6723a0f8ab86ce2e55b1ac093f2cffd87c6;p=mesa.git

radeonsi: update si_get_vs_info and si_get_vs_state for tessellation

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index 2cba96f9587..374021817cd 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -268,14 +268,20 @@ struct si_shader {
 
 static inline struct tgsi_shader_info *si_get_vs_info(struct si_context *sctx)
 {
-	return sctx->gs_shader ? &sctx->gs_shader->info
-                               : &sctx->vs_shader->info;
+	if (sctx->gs_shader)
+		return &sctx->gs_shader->info;
+	else if (sctx->tes_shader)
+		return &sctx->tes_shader->info;
+	else
+		return &sctx->vs_shader->info;
 }
 
 static inline struct si_shader* si_get_vs_state(struct si_context *sctx)
 {
 	if (sctx->gs_shader)
 		return sctx->gs_shader->current->gs_copy_shader;
+	else if (sctx->tes_shader)
+		return sctx->tes_shader->current;
 	else
 		return sctx->vs_shader->current;
 }