fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-30 00:40:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

glsl_to_tgsi: fix shadow2DArray comparison

Browse source 
v2: adjust the assertion, add a comment
This commit is contained in:
Marek Olšák 2011-09-05 06:11:26 +02:00
parent da7233840f
commit 9edd0b5ddf
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View file

@ -2558,6 +2558,8 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir)
break;
}
const glsl_type *sampler_type = ir->sampler->type;
if (ir->projector) {
if (opcode == TGSI_OPCODE_TEX) {
/* Slot the projector in as the last component of the coord. */
@ -2589,6 +2591,9 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir)
tmp_src = get_temp(glsl_type::vec4_type);
st_dst_reg tmp_dst = st_dst_reg(tmp_src);
/* Projective division not allowed for array samplers. */
assert(!sampler_type->sampler_array);
tmp_dst.writemask = WRITEMASK_Z;
emit(ir, TGSI_OPCODE_MOV, tmp_dst, this->result);
@ -2613,7 +2618,15 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir)
* coord.
*/
ir->shadow_comparitor->accept(this);
coord_dst.writemask = WRITEMASK_Z;
/* XXX This will need to be updated for cubemap array samplers. */
if (sampler_type->sampler_dimensionality == GLSL_SAMPLER_DIM_2D &&
sampler_type->sampler_array) {
coord_dst.writemask = WRITEMASK_W;
} else {
coord_dst.writemask = WRITEMASK_Z;
}
emit(ir, TGSI_OPCODE_MOV, coord_dst, this->result);
coord_dst.writemask = WRITEMASK_XYZW;
}
@ -2651,8 +2664,6 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir)
inst->tex_offsets[0].SwizzleZ = GET_SWZ(offset.swizzle, 2);
}
const glsl_type *sampler_type = ir->sampler->type;
switch (sampler_type->sampler_dimensionality) {
case GLSL_SAMPLER_DIM_1D:
inst->tex_target = (sampler_type->sampler_array)