Mesa (master): nir: allow lower_psiz_mov to run in tessellation stages

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jul 23 09:03:39 UTC 2020


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Jul 16 09:38:46 2020 -0400

nir: allow lower_psiz_mov to run in tessellation stages

Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6027>

---

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

diff --git a/src/compiler/nir/nir_lower_point_size_mov.c b/src/compiler/nir/nir_lower_point_size_mov.c
index 4a7f8085e6f..f5e18d75baf 100644
--- a/src/compiler/nir/nir_lower_point_size_mov.c
+++ b/src/compiler/nir/nir_lower_point_size_mov.c
@@ -68,8 +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 ||
-          shader->info.stage == MESA_SHADER_GEOMETRY);
+   assert(shader->info.stage != MESA_SHADER_FRAGMENT &&
+          shader->info.stage != MESA_SHADER_COMPUTE);
 
    nir_variable *out = NULL;
    nir_foreach_variable(var, &shader->outputs) {



More information about the mesa-commit mailing list