diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2014-08-08 18:17:18 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2014-08-09 03:52:58 +0200 |
| commit | f017e32c0add05b588f5f6a4bea16b84b8a051eb (patch) | |
| tree | c881bab9fd7a13136b6d20837c9a0fd8b610169c | |
| parent | 6d2ecdb4a63350cfeee803c00ac283ee013a5ee5 (diff) | |
| download | external_mesa3d-f017e32c0add05b588f5f6a4bea16b84b8a051eb.zip external_mesa3d-f017e32c0add05b588f5f6a4bea16b84b8a051eb.tar.gz external_mesa3d-f017e32c0add05b588f5f6a4bea16b84b8a051eb.tar.bz2 | |
draw: (trivial) use information about gs being present from variant key
This is a purely cosmetic change.
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 967eb7e..2c6ca0d 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; |