in case v3 doesn't get into mesa, could you extract the
src/mesa/state_tracker/st_glsl_to_nir.cpp change into a seperate patch
and just push that one? I kind of needs this as well and have a patch
doing exactly this in my repository as well.
A patch with only this would be Reviewed-by: Karol Herbst <kher...@redhat.com>
On Wed, Jan 3, 2018 at 6:04 AM, Timothy Arceri <tarc...@itsqueeze.com> wrote:
> Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
> ---
> src/gallium/drivers/radeonsi/si_shader_nir.c | 2 ++
> src/mesa/state_tracker/st_glsl_to_nir.cpp | 4 +++-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c
> b/src/gallium/drivers/radeonsi/si_shader_nir.c
> index f96bf7c2d2..5ac020d9fc 100644
> --- a/src/gallium/drivers/radeonsi/si_shader_nir.c
> +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
> @@ -157,6 +157,8 @@ void si_nir_scan_shader(const struct nir_shader *nir,
>
> assert(nir->info.stage == MESA_SHADER_VERTEX ||
> nir->info.stage == MESA_SHADER_GEOMETRY ||
> + nir->info.stage == MESA_SHADER_TESS_CTRL ||
> + nir->info.stage == MESA_SHADER_TESS_EVAL ||
> nir->info.stage == MESA_SHADER_FRAGMENT);
>
> info->processor = pipe_shader_type_from_mesa(nir->info.stage);
> diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp
> b/src/mesa/state_tracker/st_glsl_to_nir.cpp
> index 276450a64a..5683dfcccc 100644
> --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
> @@ -675,7 +675,9 @@ st_finalize_nir(struct st_context *st, struct gl_program
> *prog,
> &nir->num_outputs,
> nir->info.stage);
> st_nir_fixup_varying_slots(st, &nir->outputs);
> - } else if (nir->info.stage == MESA_SHADER_GEOMETRY) {
> + } else if (nir->info.stage == MESA_SHADER_GEOMETRY ||
> + nir->info.stage == MESA_SHADER_TESS_CTRL ||
> + nir->info.stage == MESA_SHADER_TESS_EVAL) {
> sort_varyings(&nir->inputs);
> st_nir_assign_var_locations(&nir->inputs,
> &nir->num_inputs,
> --
> 2.14.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
