Re: [Mesa-dev] [PATCH 6/6] mesa: Set _NEW_VARYING_VP_INPUTS iff varying_vp_inputs are set.

2019-05-14 Thread Mathias Fröhlich
Hi Marek,

> Reviewed-by: Marek Olšák 

Thanks for the review!
Pushed!

best

Mathias


> 
> Marek
> 
> On Sun, May 12, 2019 at 9:05 AM  wrote:
> 
> > From: Mathias Fröhlich 
> >
> > Signed-off-by: Mathias Fröhlich 
> > ---
> >  src/mesa/main/state.c | 13 ++---
> >  1 file changed, 6 insertions(+), 7 deletions(-)
> >
> > diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
> > index 9d8964952cd..3e2eb28dcc5 100644
> > --- a/src/mesa/main/state.c
> > +++ b/src/mesa/main/state.c
> > @@ -430,15 +430,14 @@ set_varying_vp_inputs(struct gl_context *ctx,
> > GLbitfield varying_inputs)
> > if (VP_MODE_FF != ctx->VertexProgram._VPMode)
> >return;
> >
> > +   /* Only fixed-func generated programs ever uses varying_vp_inputs. */
> > +   if (!ctx->VertexProgram._MaintainTnlProgram &&
> > +   !ctx->FragmentProgram._MaintainTexEnvProgram)
> > +  return;
> > +
> > if (ctx->varying_vp_inputs != varying_inputs) {
> >ctx->varying_vp_inputs = varying_inputs;
> > -
> > -  /* Only fixed-func generated programs ever use varying_vp_inputs. */
> > -  if (ctx->VertexProgram._MaintainTnlProgram ||
> > -  ctx->FragmentProgram._MaintainTexEnvProgram) {
> > - ctx->NewState |= _NEW_VARYING_VP_INPUTS;
> > -  }
> > -  /*printf("%s %x\n", __func__, varying_inputs);*/
> > +  ctx->NewState |= _NEW_VARYING_VP_INPUTS;
> > }
> >  }
> >
> > --
> > 2.21.0
> >
> > ___
> > 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

Re: [Mesa-dev] [PATCH 6/6] mesa: Set _NEW_VARYING_VP_INPUTS iff varying_vp_inputs are set.

2019-05-13 Thread Marek Olšák
For the series:

Reviewed-by: Marek Olšák 

Marek

On Sun, May 12, 2019 at 9:05 AM  wrote:

> From: Mathias Fröhlich 
>
> Signed-off-by: Mathias Fröhlich 
> ---
>  src/mesa/main/state.c | 13 ++---
>  1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
> index 9d8964952cd..3e2eb28dcc5 100644
> --- a/src/mesa/main/state.c
> +++ b/src/mesa/main/state.c
> @@ -430,15 +430,14 @@ set_varying_vp_inputs(struct gl_context *ctx,
> GLbitfield varying_inputs)
> if (VP_MODE_FF != ctx->VertexProgram._VPMode)
>return;
>
> +   /* Only fixed-func generated programs ever uses varying_vp_inputs. */
> +   if (!ctx->VertexProgram._MaintainTnlProgram &&
> +   !ctx->FragmentProgram._MaintainTexEnvProgram)
> +  return;
> +
> if (ctx->varying_vp_inputs != varying_inputs) {
>ctx->varying_vp_inputs = varying_inputs;
> -
> -  /* Only fixed-func generated programs ever use varying_vp_inputs. */
> -  if (ctx->VertexProgram._MaintainTnlProgram ||
> -  ctx->FragmentProgram._MaintainTexEnvProgram) {
> - ctx->NewState |= _NEW_VARYING_VP_INPUTS;
> -  }
> -  /*printf("%s %x\n", __func__, varying_inputs);*/
> +  ctx->NewState |= _NEW_VARYING_VP_INPUTS;
> }
>  }
>
> --
> 2.21.0
>
> ___
> 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 6/6] mesa: Set _NEW_VARYING_VP_INPUTS iff varying_vp_inputs are set.

2019-05-12 Thread Mathias . Froehlich
From: Mathias Fröhlich 

Signed-off-by: Mathias Fröhlich 
---
 src/mesa/main/state.c | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 9d8964952cd..3e2eb28dcc5 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -430,15 +430,14 @@ set_varying_vp_inputs(struct gl_context *ctx, GLbitfield 
varying_inputs)
if (VP_MODE_FF != ctx->VertexProgram._VPMode)
   return;

+   /* Only fixed-func generated programs ever uses varying_vp_inputs. */
+   if (!ctx->VertexProgram._MaintainTnlProgram &&
+   !ctx->FragmentProgram._MaintainTexEnvProgram)
+  return;
+
if (ctx->varying_vp_inputs != varying_inputs) {
   ctx->varying_vp_inputs = varying_inputs;
-
-  /* Only fixed-func generated programs ever use varying_vp_inputs. */
-  if (ctx->VertexProgram._MaintainTnlProgram ||
-  ctx->FragmentProgram._MaintainTexEnvProgram) {
- ctx->NewState |= _NEW_VARYING_VP_INPUTS;
-  }
-  /*printf("%s %x\n", __func__, varying_inputs);*/
+  ctx->NewState |= _NEW_VARYING_VP_INPUTS;
}
 }

--
2.21.0

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