Re: [Mesa-dev] [PATCH 7/7] radeonsi/nir: add support vs double inputs

2018-01-10 Thread Dieter Nützel

For the series:

Tested-by: Dieter Nützel 

Dieter

Am 08.01.2018 01:35, schrieb Timothy Arceri:

---
 src/gallium/drivers/radeonsi/si_shader_nir.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c
b/src/gallium/drivers/radeonsi/si_shader_nir.c
index d05eb36d80..2218b7ad81 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -647,6 +647,11 @@ bool si_nir_build_llvm(struct si_shader_context
*ctx, struct nir_shader *nir)
if (nir->info.stage == MESA_SHADER_VERTEX) {
declare_nir_input_vs(ctx, variable, input_idx / 
4, data);
bitcast_inputs(ctx, data, input_idx);
+   if (glsl_type_is_dual_slot(variable->type)) {
+   input_idx += 4;
+   declare_nir_input_vs(ctx, variable, 
input_idx / 4, data);
+   bitcast_inputs(ctx, data, input_idx);
+   }
} else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
declare_nir_input_fs(ctx, variable, input_idx / 
4, data);
bitcast_inputs(ctx, data, input_idx);

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH 7/7] radeonsi/nir: add support vs double inputs

2018-01-10 Thread Marek Olšák
For patches 1, 4-7:

Reviewed-by: Marek Olšák 

Marek

On Mon, Jan 8, 2018 at 1:35 AM, Timothy Arceri  wrote:
> ---
>  src/gallium/drivers/radeonsi/si_shader_nir.c | 5 +
>  1 file changed, 5 insertions(+)
>
> diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c 
> b/src/gallium/drivers/radeonsi/si_shader_nir.c
> index d05eb36d80..2218b7ad81 100644
> --- a/src/gallium/drivers/radeonsi/si_shader_nir.c
> +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
> @@ -647,6 +647,11 @@ bool si_nir_build_llvm(struct si_shader_context *ctx, 
> struct nir_shader *nir)
> if (nir->info.stage == MESA_SHADER_VERTEX) {
> declare_nir_input_vs(ctx, variable, input_idx 
> / 4, data);
> bitcast_inputs(ctx, data, input_idx);
> +   if (glsl_type_is_dual_slot(variable->type)) {
> +   input_idx += 4;
> +   declare_nir_input_vs(ctx, variable, 
> input_idx / 4, data);
> +   bitcast_inputs(ctx, data, input_idx);
> +   }
> } else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
> declare_nir_input_fs(ctx, variable, input_idx 
> / 4, data);
> bitcast_inputs(ctx, data, input_idx);
> --
> 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


[Mesa-dev] [PATCH 7/7] radeonsi/nir: add support vs double inputs

2018-01-07 Thread Timothy Arceri
---
 src/gallium/drivers/radeonsi/si_shader_nir.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c 
b/src/gallium/drivers/radeonsi/si_shader_nir.c
index d05eb36d80..2218b7ad81 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -647,6 +647,11 @@ bool si_nir_build_llvm(struct si_shader_context *ctx, 
struct nir_shader *nir)
if (nir->info.stage == MESA_SHADER_VERTEX) {
declare_nir_input_vs(ctx, variable, input_idx / 
4, data);
bitcast_inputs(ctx, data, input_idx);
+   if (glsl_type_is_dual_slot(variable->type)) {
+   input_idx += 4;
+   declare_nir_input_vs(ctx, variable, 
input_idx / 4, data);
+   bitcast_inputs(ctx, data, input_idx);
+   }
} else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
declare_nir_input_fs(ctx, variable, input_idx / 
4, data);
bitcast_inputs(ctx, data, input_idx);
-- 
2.14.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev