diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2013-01-25 16:33:43 -0800 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2013-01-28 06:58:06 -0800 |
| commit | cbf0f666311a5cb2720a4d6f4c540da1dd33e418 (patch) | |
| tree | 3c2009de6b8dc97d983bb38dfb55f8b3fc8b0574 /src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h | |
| parent | c789b981b244333cfc903bcd1e2fefc010500013 (diff) | |
| download | external_mesa3d-cbf0f666311a5cb2720a4d6f4c540da1dd33e418.zip external_mesa3d-cbf0f666311a5cb2720a4d6f4c540da1dd33e418.tar.gz external_mesa3d-cbf0f666311a5cb2720a4d6f4c540da1dd33e418.tar.bz2 | |
gallivm,draw,llvmpipe: mass rename of unit->texture_unit/sampler_unit
Make it obvious what "unit" this is (no change in functionality).
draw still uses "unit" in places where it changes the shader by adding
texture sampling itself - it seems like this can't work with shaders
using dx10-style sample opcodes (can't mix gl-style and dx10-style
sample instructions in a shader).
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h index 55b3bc1..6590e8c 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h @@ -42,7 +42,7 @@ void lp_build_sample_aos(struct lp_build_sample_context *bld, - unsigned unit, + unsigned sampler_unit, LLVMValueRef s, LLVMValueRef t, LLVMValueRef r, |