[Mesa-dev] [PATCH] st: remove pre C99 statement block for variable declaration

[Marek Olšák]

Acked-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Tue, Jan 31, 2017 at 12:25 AM, Timothy Arceri <t_arceri at yahoo.com.au> wrote:
> ---
>  src/mesa/state_tracker/st_program.c | 118 ++++++++++++++++++------------------
>  1 file changed, 58 insertions(+), 60 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
> index 94204d7..b2d1586 100644
> --- a/src/mesa/state_tracker/st_program.c
> +++ b/src/mesa/state_tracker/st_program.c
> @@ -757,72 +757,70 @@ st_translate_fragment_program(struct st_context *st,
>     /*
>      * Semantics and mapping for outputs
>      */
> -   {
> -      GLbitfield64 outputsWritten = stfp->Base.info.outputs_written;
> -
> -      /* if z is written, emit that first */
> -      if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {
> -         fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_POSITION;
> -         fs_output_semantic_index[fs_num_outputs] = 0;
> -         outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs;
> -         fs_num_outputs++;
> -         outputsWritten &= ~(1 << FRAG_RESULT_DEPTH);
> -      }
> +   GLbitfield64 outputsWritten = stfp->Base.info.outputs_written;
> +
> +   /* if z is written, emit that first */
> +   if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {
> +      fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_POSITION;
> +      fs_output_semantic_index[fs_num_outputs] = 0;
> +      outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs;
> +      fs_num_outputs++;
> +      outputsWritten &= ~(1 << FRAG_RESULT_DEPTH);
> +   }
>
> -      if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_STENCIL)) {
> -         fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_STENCIL;
> -         fs_output_semantic_index[fs_num_outputs] = 0;
> -         outputMapping[FRAG_RESULT_STENCIL] = fs_num_outputs;
> -         fs_num_outputs++;
> -         outputsWritten &= ~(1 << FRAG_RESULT_STENCIL);
> -      }
> +   if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_STENCIL)) {
> +      fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_STENCIL;
> +      fs_output_semantic_index[fs_num_outputs] = 0;
> +      outputMapping[FRAG_RESULT_STENCIL] = fs_num_outputs;
> +      fs_num_outputs++;
> +      outputsWritten &= ~(1 << FRAG_RESULT_STENCIL);
> +   }
>
> -      if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)) {
> -         fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_SAMPLEMASK;
> -         fs_output_semantic_index[fs_num_outputs] = 0;
> -         outputMapping[FRAG_RESULT_SAMPLE_MASK] = fs_num_outputs;
> -         fs_num_outputs++;
> -         outputsWritten &= ~(1 << FRAG_RESULT_SAMPLE_MASK);
> -      }
> +   if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)) {
> +      fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_SAMPLEMASK;
> +      fs_output_semantic_index[fs_num_outputs] = 0;
> +      outputMapping[FRAG_RESULT_SAMPLE_MASK] = fs_num_outputs;
> +      fs_num_outputs++;
> +      outputsWritten &= ~(1 << FRAG_RESULT_SAMPLE_MASK);
> +   }
>
> -      /* handle remaining outputs (color) */
> -      for (attr = 0; attr < ARRAY_SIZE(outputMapping); attr++) {
> -         const GLbitfield64 written = attr < FRAG_RESULT_MAX ? outputsWritten :
> -            stfp->Base.SecondaryOutputsWritten;
> -         const unsigned loc = attr % FRAG_RESULT_MAX;
> -
> -         if (written & BITFIELD64_BIT(loc)) {
> -            switch (loc) {
> -            case FRAG_RESULT_DEPTH:
> -            case FRAG_RESULT_STENCIL:
> -            case FRAG_RESULT_SAMPLE_MASK:
> -               /* handled above */
> -               assert(0);
> -               break;
> -            case FRAG_RESULT_COLOR:
> -               write_all = GL_TRUE; /* fallthrough */
> -            default: {
> -               int index;
> -               assert(loc == FRAG_RESULT_COLOR ||
> -                      (FRAG_RESULT_DATA0 <= loc && loc < FRAG_RESULT_MAX));
> -
> -               index = (loc == FRAG_RESULT_COLOR) ? 0 : (loc - FRAG_RESULT_DATA0);
> -
> -               if (attr >= FRAG_RESULT_MAX) {
> -                  /* Secondary color for dual source blending. */
> -                  assert(index == 0);
> -                  index++;
> -               }
> -
> -               fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_COLOR;
> -               fs_output_semantic_index[fs_num_outputs] = index;
> -               outputMapping[attr] = fs_num_outputs;
> -               break;
> -            }
> +   /* handle remaining outputs (color) */
> +   for (attr = 0; attr < ARRAY_SIZE(outputMapping); attr++) {
> +      const GLbitfield64 written = attr < FRAG_RESULT_MAX ? outputsWritten :
> +         stfp->Base.SecondaryOutputsWritten;
> +      const unsigned loc = attr % FRAG_RESULT_MAX;
> +
> +      if (written & BITFIELD64_BIT(loc)) {
> +         switch (loc) {
> +         case FRAG_RESULT_DEPTH:
> +         case FRAG_RESULT_STENCIL:
> +         case FRAG_RESULT_SAMPLE_MASK:
> +            /* handled above */
> +            assert(0);
> +            break;
> +         case FRAG_RESULT_COLOR:
> +            write_all = GL_TRUE; /* fallthrough */
> +         default: {
> +            int index;
> +            assert(loc == FRAG_RESULT_COLOR ||
> +                   (FRAG_RESULT_DATA0 <= loc && loc < FRAG_RESULT_MAX));
> +
> +            index = (loc == FRAG_RESULT_COLOR) ? 0 : (loc - FRAG_RESULT_DATA0);
> +
> +            if (attr >= FRAG_RESULT_MAX) {
> +               /* Secondary color for dual source blending. */
> +               assert(index == 0);
> +               index++;
>              }
>
> -            fs_num_outputs++;
> +            fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_COLOR;
> +            fs_output_semantic_index[fs_num_outputs] = index;
> +            outputMapping[attr] = fs_num_outputs;
> +            break;
> +         }
>           }
> +
> +         fs_num_outputs++;
>        }
>     }
>
> --
> 2.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev