diff options
| author | Hui Qi Tay <tayhuiqithq@gmail.com> | 2010-10-14 14:04:39 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-10-14 22:34:10 +0100 |
| commit | 26ff7523b69ddb377ade29296d20abfc46e69489 (patch) | |
| tree | 9452f4df09a3e0b93bc2f79303345959b6a60e6a /src/gallium/auxiliary | |
| parent | 08f890d4c3b8376d1840f90474f7c56329432d95 (diff) | |
| download | external_mesa3d-26ff7523b69ddb377ade29296d20abfc46e69489.zip external_mesa3d-26ff7523b69ddb377ade29296d20abfc46e69489.tar.gz external_mesa3d-26ff7523b69ddb377ade29296d20abfc46e69489.tar.bz2 | |
draw: sanitize llvm variant key
Fixes recompilation, but seems to be broken with llvm 2.8.
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.c | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 5f11b82..1c18d90 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -1430,6 +1430,7 @@ draw_llvm_make_variant_key(struct draw_llvm *llvm, char *store) key->enable_d3dclipping = (boolean)!llvm->draw->rasterizer->gl_rasterization_rules; key->need_edgeflags = (llvm->draw->vs.edgeflag_output ? TRUE : FALSE); key->nr_planes = llvm->draw->nr_planes; + key->pad = 0; /* All variants of this shader will have the same value for * nr_samplers. Not yet trying to compact away holes in the diff --git a/src/gallium/auxiliary/draw/draw_llvm.h b/src/gallium/auxiliary/draw/draw_llvm.h index fc78854..def0681 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.h +++ b/src/gallium/auxiliary/draw/draw_llvm.h @@ -168,7 +168,8 @@ struct draw_llvm_variant_key unsigned bypass_viewport:1; unsigned enable_d3dclipping:1; unsigned need_edgeflags:1; - unsigned nr_planes; + unsigned nr_planes:4; + unsigned pad:26; /* Variable number of vertex elements: */ |