Mesa (master): nir: allow nir_lower_point_size_mov to run in geometry shader

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Jul 11 07:51:01 UTC 2020


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jul  8 11:59:16 2020 -0400

nir: allow nir_lower_point_size_mov to run in geometry shader

geometry shaders may need to emit PSIZ as well

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5851>

---

 src/compiler/nir/nir_lower_point_size_mov.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_lower_point_size_mov.c b/src/compiler/nir/nir_lower_point_size_mov.c
index 0b9226b60fa..4a7f8085e6f 100644
--- a/src/compiler/nir/nir_lower_point_size_mov.c
+++ b/src/compiler/nir/nir_lower_point_size_mov.c
@@ -68,7 +68,8 @@ void
 nir_lower_point_size_mov(nir_shader *shader,
                          const gl_state_index16 *pointsize_state_tokens)
 {
-   assert(shader->info.stage == MESA_SHADER_VERTEX);
+   assert(shader->info.stage == MESA_SHADER_VERTEX ||
+          shader->info.stage == MESA_SHADER_GEOMETRY);
 
    nir_variable *out = NULL;
    nir_foreach_variable(var, &shader->outputs) {



More information about the mesa-commit mailing list