[Mesa-dev] [PATCH 2/2] mesa: fix indentation in ffvertex_prog.c

Roland Scheidegger sroland at vmware.com
Thu Nov 21 15:30:54 PST 2013


On 11/21/2013 10:12 PM, Brian Paul wrote:
> And use a better assertion.
> ---
>   src/mesa/main/ffvertex_prog.c |   26 ++++++++++++++------------
>   1 file changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
> index be6ac0f..074fbf9 100644
> --- a/src/mesa/main/ffvertex_prog.c
> +++ b/src/mesa/main/ffvertex_prog.c
> @@ -1306,20 +1306,22 @@ static void build_fog( struct tnl_program *p )
>
>         switch (p->state->fog_distance_mode) {
>         case FDM_EYE_RADIAL: /* Z = sqrt(Xe*Xe + Ye*Ye + Ze*Ze) */
> -	input = get_eye_position(p);
> -	emit_op2(p, OPCODE_DP3, fog, WRITEMASK_X, input, input);
> -	emit_op1(p, OPCODE_RSQ, fog, WRITEMASK_X, fog);
> -	emit_op1(p, OPCODE_RCP, fog, WRITEMASK_X, fog);
> -	break;
> +         input = get_eye_position(p);
> +         emit_op2(p, OPCODE_DP3, fog, WRITEMASK_X, input, input);
> +         emit_op1(p, OPCODE_RSQ, fog, WRITEMASK_X, fog);
> +         emit_op1(p, OPCODE_RCP, fog, WRITEMASK_X, fog);
> +         break;
>         case FDM_EYE_PLANE: /* Z = Ze */
> -	input = get_eye_position_z(p);
> -	emit_op1(p, OPCODE_MOV, fog, WRITEMASK_X, input);
> -	break;
> +         input = get_eye_position_z(p);
> +         emit_op1(p, OPCODE_MOV, fog, WRITEMASK_X, input);
> +         break;
>         case FDM_EYE_PLANE_ABS: /* Z = abs(Ze) */
> -	input = get_eye_position_z(p);
> -	emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input);
> -	break;
> -      default: assert(0); break; /* can't happen */
> +         input = get_eye_position_z(p);
> +         emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input);
> +         break;
> +      default:
> +         assert(!"Bad fog mode in build_fog()");
> +         break;
>         }
>
>      }
>

Reviewed-by: Roland Scheidegger <sroland at vmware.com>


More information about the mesa-dev mailing list