[Mesa-dev] [PATCH 07/16] nir: passthrough-edgeflags support

[Eric Anholt]

Rob Clark <robdclark at gmail.com> writes:

> From: Rob Clark <robclark at freedesktop.org>
>
> Handled by tgsi_emulate for glsl->tgsi case.
>
> Signed-off-by: Rob Clark <robclark at freedesktop.org>
> Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
> ---
>  src/compiler/Makefile.sources                      |  1 +
>  src/compiler/nir/nir.h                             |  2 +
>  src/compiler/nir/nir_lower_passthrough_edgeflags.c | 82 ++++++++++++++++++++++
>  3 files changed, 85 insertions(+)
>  create mode 100644 src/compiler/nir/nir_lower_passthrough_edgeflags.c
>
> diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
> index 12badf0..ae7efbf 100644
> --- a/src/compiler/Makefile.sources
> +++ b/src/compiler/Makefile.sources
> @@ -197,6 +197,7 @@ NIR_FILES = \
>  	nir/nir_lower_indirect_derefs.c \
>  	nir/nir_lower_io.c \
>  	nir/nir_lower_outputs_to_temporaries.c \
> +	nir/nir_lower_passthrough_edgeflags.c \
>  	nir/nir_lower_phis_to_scalar.c \
>  	nir/nir_lower_returns.c \
>  	nir/nir_lower_samplers.c \
> diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
> index 67373b6..65f75bd 100644
> --- a/src/compiler/nir/nir.h
> +++ b/src/compiler/nir/nir.h
> @@ -2246,6 +2246,8 @@ void nir_lower_two_sided_color(nir_shader *shader);
>  
>  void nir_lower_clamp_color_outputs(nir_shader *shader);
>  
> +void nir_lower_passthrough_edgeflags(nir_shader *shader);
> +
>  typedef struct nir_lower_wpos_ytransform_options {
>     int state_tokens[5];
>     bool fs_coord_origin_upper_left :1;
> diff --git a/src/compiler/nir/nir_lower_passthrough_edgeflags.c b/src/compiler/nir/nir_lower_passthrough_edgeflags.c
> new file mode 100644
> index 0000000..1afcbf7
> --- /dev/null
> +++ b/src/compiler/nir/nir_lower_passthrough_edgeflags.c
> @@ -0,0 +1,82 @@
> +/*
> + * Copyright © 2015 Red Hat
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
> + */
> +
> +#include "nir.h"
> +#include "nir_builder.h"
> +
> +typedef struct {
> +   nir_shader *shader;
> +   nir_builder b;
> +} lower_state;
> +
> +static nir_variable *
> +create_edgeflag_var(nir_shader *shader, bool output)
> +{
> +   nir_variable_mode mode = output ? nir_var_shader_out : nir_var_shader_in;
> +   nir_variable *var = nir_variable_create(shader, mode, glsl_vec4_type(),
> +                                           output ? "edgeflag_out" : "edgeflag_in");
> +   var->data.location = output ? VARYING_SLOT_EDGE : VERT_ATTRIB_EDGEFLAG;
> +   return var;
> +}
> +
> +static bool
> +lower_block(nir_block *block, void *_state)
> +{
> +   lower_state *state = _state;
> +   nir_builder *b = &state->b;
> +   nir_variable *in, *out;
> +   nir_ssa_def *def;
> +
> +   in = create_edgeflag_var(state->shader, false);
> +   out = create_edgeflag_var(state->shader, true);

I think the code would be clearer if you inlined create_edgeflag_var.

> +
> +   b->cursor = nir_before_block(block);
> +
> +   def = nir_load_var(b, in);
> +   nir_store_var(b, out, def, 0xf);
> +
> +   /* only do this for first block: */
> +   return false;
> +}
> +
> +static void
> +lower_impl(lower_state *state, nir_function_impl *impl)
> +{
> +   nir_builder_init(&state->b, impl);
> +
> +   nir_foreach_block(impl, lower_block, state);

I think in the previous review when I suggested nir_before_block(), I
actually wanted to say that you probably want here to just do
nir_before_cf_list(&impl->cf_node).

> +   nir_metadata_preserve(impl, nir_metadata_block_index |
> +                               nir_metadata_dominance);
> +}
> +
> +void nir_lower_passthrough_edgeflags(nir_shader *shader)
> +{
> +   lower_state state = {
> +      .shader = shader,
> +   };
> +
> +   nir_foreach_function(shader, function) {
> +      if ((strcmp(function->name, "main") == 0) && function->impl)
> +         lower_impl(&state, function->impl);
> +   }
> +}

We pretty clearly want a "Get me the main impl" helper for NIR, but I'm
not going to block your code on that.  With the cursor setup changed, 6
and 7 are:

Reviewed-by: Eric Anholt <eric at anholt.net>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160408/ddb5acdb/attachment-0001.sig>