From cbf0f666311a5cb2720a4d6f4c540da1dd33e418 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Fri, 25 Jan 2013 16:33:43 -0800 Subject: 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 Reviewed-by: Jose Fonseca --- src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gallium/auxiliary/gallivm/lp_bld_sample_aos.h') 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, -- cgit v1.1