[Mesa-dev] [PATCH 2/2] draw: (trivial) use information about gs being present from variant key

[Brian Paul]

On 08/08/2014 11:02 AM, sroland at vmware.com wrote:
> From: Roland Scheidegger <sroland at vmware.com>
>
> This is a purely cosmetic change.
> ---
>   src/gallium/auxiliary/draw/draw_llvm.c | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
> index 5a7bedb..3d9ddf2 100644
> --- a/src/gallium/auxiliary/draw/draw_llvm.c
> +++ b/src/gallium/auxiliary/draw/draw_llvm.c
> @@ -1499,16 +1499,15 @@ draw_llvm_generate(struct draw_llvm *llvm, struct draw_llvm_variant *variant,
>      LLVMValueRef fetch_max;
>      struct lp_build_sampler_soa *sampler = 0;
>      LLVMValueRef ret, clipmask_bool_ptr;
> -   const struct draw_geometry_shader *gs = draw->gs.geometry_shader;
>      struct draw_llvm_variant_key *key = &variant->key;
>      /* If geometry shader is present we need to skip both the viewport
>       * transformation and clipping otherwise the inputs to the geometry
>       * shader will be incorrect.
>       */
> -   const boolean bypass_viewport = gs || key->bypass_viewport;
> -   const boolean enable_cliptest = !gs && (key->clip_xy ||
> -                                           key->clip_z  ||
> -                                           key->clip_user);
> +   const boolean bypass_viewport = key->has_gs || key->bypass_viewport;
> +   const boolean enable_cliptest = !key->has_gs && (key->clip_xy ||
> +                                                    key->clip_z  ||
> +                                                    key->clip_user);
>      LLVMValueRef variant_func;
>      const unsigned pos = llvm->draw->vs.position_output;
>      const unsigned cv = llvm->draw->vs.clipvertex_output;
>

Reviewed-by: Brian Paul <brianp at vmware.com>