Mesa (master): radeonsi/nir: Only set window_space_position for vertex shaders.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Mar 8 00:44:07 UTC 2019


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

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Thu Mar  7 08:19:02 2019 +0100

radeonsi/nir: Only set window_space_position for vertex shaders.

By mistake, this was previously set for all shaders.
It is a vertex shader property so only makes sense to
set it for vertex shaders.

Signed-Off-By: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-By: Timothy Arceri <tarceri at itsqueeze.com>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>

---

 src/gallium/drivers/radeonsi/si_shader_nir.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 0ead9348a56..5fc1df250aa 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -343,8 +343,10 @@ void si_nir_scan_shader(const struct nir_shader *nir,
 	info->properties[TGSI_PROPERTY_NEXT_SHADER] =
 		pipe_shader_type_from_mesa(nir->info.next_stage);
 
-	info->properties[TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION] =
-		nir->info.vs.window_space_position;
+	if (nir->info.stage == MESA_SHADER_VERTEX) {
+		info->properties[TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION] =
+			nir->info.vs.window_space_position;
+	}
 
 	if (nir->info.stage == MESA_SHADER_TESS_CTRL) {
 		info->properties[TGSI_PROPERTY_TCS_VERTICES_OUT] =




More information about the mesa-commit mailing list