Module: Mesa Branch: master Commit: 6b35c2b110be0d9ae6a292250fdcbab11a9190a5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b35c2b110be0d9ae6a292250fdcbab11a9190a5
Author: Roland Scheidegger <[email protected]> Date: Wed Feb 27 19:07:18 2013 +0100 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 <[email protected]> --- src/gallium/auxiliary/draw/draw_context.c | 13 +- src/gallium/auxiliary/draw/draw_context.h | 7 +- src/gallium/auxiliary/draw/draw_gs.c | 3 +- src/gallium/auxiliary/draw/draw_private.h | 6 +- src/gallium/auxiliary/draw/draw_vs_exec.c | 3 +- src/gallium/auxiliary/tgsi/tgsi_exec.c | 81 ++++----- src/gallium/auxiliary/tgsi/tgsi_exec.h | 22 ++- src/gallium/drivers/softpipe/sp_context.c | 29 ++-- src/gallium/drivers/softpipe/sp_context.h | 2 +- src/gallium/drivers/softpipe/sp_fs_exec.c | 9 +- src/gallium/drivers/softpipe/sp_state.h | 2 +- src/gallium/drivers/softpipe/sp_state_derived.c | 4 +- src/gallium/drivers/softpipe/sp_state_sampler.c | 4 +- src/gallium/drivers/softpipe/sp_tex_sample.c | 206 +++++++++++++--------- src/gallium/drivers/softpipe/sp_tex_sample.h | 47 ++++-- 15 files changed, 249 insertions(+), 189 deletions(-) Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=6b35c2b110be0d9ae6a292250fdcbab11a9190a5 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
