diff options
author | Roland Scheidegger <sroland@vmware.com> | 2013-02-27 19:07:18 +0100 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2013-02-28 03:39:53 +0100 |
commit | 6b35c2b110be0d9ae6a292250fdcbab11a9190a5 (patch) | |
tree | 5141a7490ac67ee8df3542f8396b2ba4e6423ec7 /src/gallium/auxiliary/draw/draw_private.h | |
parent | 0845d16976b41e0a151f96b900fb58a7f26d7774 (diff) | |
download | external_mesa3d-6b35c2b110be0d9ae6a292250fdcbab11a9190a5.zip external_mesa3d-6b35c2b110be0d9ae6a292250fdcbab11a9190a5.tar.gz external_mesa3d-6b35c2b110be0d9ae6a292250fdcbab11a9190a5.tar.bz2 |
softpipe/draw/tgsi: simplify driver/tgsi sampler interface
Use a single sampler adapter instead of per-sampler-unit samplers,
and just pass along texture unit and sampler unit in the calls.
The reason is that for dx10-style sample opcodes pre-wired
samplers including all the texture state aren't really feasible (and for
sample_i/sviewinfo we don't even have samplers).
Of course right now softpipe doesn't actually do anything more than
just look up all its pre-wired per-texunit/per-samplerunit sampler as
it did before so this doesn't really achieve much except one more
function call, however this is now all softpipe's fault (fixing that in
a way which doesn't suck is still an unsolved problem).
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_private.h')
-rw-r--r-- | src/gallium/auxiliary/draw/draw_private.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h index ec5791c..5063c3c 100644 --- a/src/gallium/auxiliary/draw/draw_private.h +++ b/src/gallium/auxiliary/draw/draw_private.h @@ -248,8 +248,7 @@ struct draw_context struct { struct tgsi_exec_machine *machine; - struct tgsi_sampler **samplers; - uint num_samplers; + struct tgsi_sampler *sampler; } tgsi; struct translate *fetch; @@ -268,8 +267,7 @@ struct draw_context struct { struct tgsi_exec_machine *machine; - struct tgsi_sampler **samplers; - uint num_samplers; + struct tgsi_sampler *sampler; } tgsi; } gs; |