AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965/vs: Rename "sampler" to "texunit" in texturing code.

Browse Source 
The number we're passing around is actually the ID of the texture unit,
as opposed to the numerical value our of sampler uniforms.  Calling it
"texunit" clarifies this slightly.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke
2012-08-21 12:16:46 -07:00
parent 0ad2dce24a
commit 96a22f3583
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+5 -5
View File
@@ -1833,7 +1833,7 @@ void
vec4_visitor::visit(ir_texture *ir)
{
int sampler = _mesa_get_sampler_uniform_value(ir->sampler, prog, &vp->Base);
sampler = vp->Base.SamplerUnits[sampler];
int texunit = vp->Base.SamplerUnits[sampler];
/* Should be lowered by do_lower_texture_projection */
assert(!ir->projector);
@@ -1897,7 +1897,7 @@ vec4_visitor::visit(ir_texture *ir)
inst->header_present = ir->offset || intel->gen < 5;
inst->base_mrf = 2;
inst->mlen = inst->header_present + 1; /* always at least one */
inst->sampler = sampler;
inst->sampler = texunit;
inst->dst = dst_reg(this, ir->type);
inst->shadow_compare = ir->shadow_comparitor != NULL;
@@ -1999,15 +1999,15 @@ vec4_visitor::visit(ir_texture *ir)
emit(inst);
swizzle_result(ir, src_reg(inst->dst), sampler);
swizzle_result(ir, src_reg(inst->dst), texunit);
}
void
vec4_visitor::swizzle_result(ir_texture *ir, src_reg orig_val, int sampler)
vec4_visitor::swizzle_result(ir_texture *ir, src_reg orig_val, int texunit)
{
this->result = orig_val;
int s = c->key.tex.swizzles[sampler];
int s = c->key.tex.swizzles[texunit];
if (ir->op == ir_txs || ir->type == glsl_type::float_type
|| s == SWIZZLE_NOOP)