[Mesa-dev] [PATCH] r600: GL_COORD_REPLACE state is only relevant when point sprites are enabled.

[Alex Deucher]

On Tue, Jun 15, 2010 at 4:00 PM, Henri Verbeet <hverbeet at gmail.com> wrote:
> ---
>  src/mesa/drivers/dri/r600/r700_fragprog.c |   17 +++++++++++------
>  1 files changed, 11 insertions(+), 6 deletions(-)

Pushed.  thanks!

>
> diff --git a/src/mesa/drivers/dri/r600/r700_fragprog.c b/src/mesa/drivers/dri/r600/r700_fragprog.c
> index 80fab71..fbb808e 100644
> --- a/src/mesa/drivers/dri/r600/r700_fragprog.c
> +++ b/src/mesa/drivers/dri/r600/r700_fragprog.c
> @@ -563,11 +563,15 @@ GLboolean r700SetupFragmentProgram(GLcontext * ctx)
>
>     /* see if we need any point_sprite replacements, also increase num_interp
>      * as there's no vp output for them */
> -    for (i = FRAG_ATTRIB_TEX0; i<= FRAG_ATTRIB_TEX7; i++)
> +    if (ctx->Point.PointSprite)
>     {
> -        if(ctx->Point.CoordReplace[i - FRAG_ATTRIB_TEX0] == GL_TRUE) {
> -            ui++;
> -            point_sprite = GL_TRUE;
> +        for (i = FRAG_ATTRIB_TEX0; i<= FRAG_ATTRIB_TEX7; i++)
> +        {
> +            if (ctx->Point.CoordReplace[i - FRAG_ATTRIB_TEX0] == GL_TRUE)
> +            {
> +                ui++;
> +                point_sprite = GL_TRUE;
> +            }
>         }
>     }
>
> @@ -670,8 +674,9 @@ GLboolean r700SetupFragmentProgram(GLcontext * ctx)
>
>     for(i=0; i<8; i++)
>     {
> +           GLboolean coord_replace = ctx->Point.PointSprite && ctx->Point.CoordReplace[i];
>            unBit = 1 << (VERT_RESULT_TEX0 + i);
> -           if((OutputsWritten & unBit) || (ctx->Point.CoordReplace[i] == GL_TRUE))
> +           if ((OutputsWritten & unBit) || coord_replace)
>            {
>                    ui = pAsm->uiFP_AttributeMap[FRAG_ATTRIB_TEX0 + i];
>                    SETbit(r700->SPI_PS_INPUT_CNTL[ui].u32All, SEL_CENTROID_bit);
> @@ -679,7 +684,7 @@ GLboolean r700SetupFragmentProgram(GLcontext * ctx)
>                             SEMANTIC_shift, SEMANTIC_mask);
>                    CLEARbit(r700->SPI_PS_INPUT_CNTL[ui].u32All, FLAT_SHADE_bit);
>                    /* ARB_point_sprite */
> -                   if(ctx->Point.CoordReplace[i] == GL_TRUE)
> +                   if (coord_replace)
>                    {
>                             SETbit(r700->SPI_PS_INPUT_CNTL[ui].u32All, PT_SPRITE_TEX_bit);
>                    }
> --
> 1.7.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>