diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2014-05-07 19:06:39 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2014-05-08 16:26:49 +0200 |
| commit | 9af68e9b1d116cdc8eb6a22bac091fe4716679e6 (patch) | |
| tree | fbcbda42c4b4a5f4079375f1457a909eaf5a558f /src/gallium/auxiliary/draw/draw_private.h | |
| parent | e6967270c75a5b669152127bb7a746d55f4407a6 (diff) | |
| download | external_mesa3d-9af68e9b1d116cdc8eb6a22bac091fe4716679e6.zip external_mesa3d-9af68e9b1d116cdc8eb6a22bac091fe4716679e6.tar.gz external_mesa3d-9af68e9b1d116cdc8eb6a22bac091fe4716679e6.tar.bz2 | |
draw: do not use draw_get_option_use_llvm() inside draw execution paths
1c73e919a4b4dd79166d0633075990056f27fd28 made it possible to not allocate
the tgsi machine if llvm was used. However, draw_get_option_use_llvm() is
not reliable after draw context creation, since drivers can explicitly
request a non-llvm draw context even if draw_get_option_use_llvm() would
return true (and softpipe does just that) which leads to crashes.
Thus use draw->llvm to determine if we're using llvm or not instead (and
make draw->llvm available even if HAVE_LLVM is false so we don't have to put
even more ifdefs).
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_private.h')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_private.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h index 801d009..783c3ef 100644 --- a/src/gallium/auxiliary/draw/draw_private.h +++ b/src/gallium/auxiliary/draw/draw_private.h @@ -47,7 +47,6 @@ #include "tgsi/tgsi_scan.h" #ifdef HAVE_LLVM -struct draw_llvm; struct gallivm_state; #endif @@ -69,6 +68,7 @@ struct tgsi_exec_machine; struct tgsi_sampler; struct draw_pt_front_end; struct draw_assembler; +struct draw_llvm; /** @@ -318,9 +318,7 @@ struct draw_context unsigned start_instance; unsigned start_index; -#ifdef HAVE_LLVM struct draw_llvm *llvm; -#endif /** Texture sampler and sampler view state. * Note that we have arrays indexed by shader type. At this time |