OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ir_to_mesa: Add support for projected non-shadow/bias/lod texturing.

Browse Source 
Fixes:
glsl-fs-texture2dproj
glsl-fs-texture2dproj-2
This commit is contained in:
Eric Anholt
2010-07-02 14:49:29 -07:00
parent cab95c228b
commit de75dfac4e
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mesa/shader/ir_to_mesa.cpp
View File

@@ -1287,13 +1287,18 @@ ir_to_mesa_visitor::visit(ir_call *ir)
void void
ir_to_mesa_visitor::visit(ir_texture *ir) ir_to_mesa_visitor::visit(ir_texture *ir)
{ {
ir_to_mesa_src_reg result_src, coord; ir_to_mesa_src_reg result_src, coord, projector;
ir_to_mesa_dst_reg result_dst, lod_info; ir_to_mesa_dst_reg result_dst, lod_info;
ir_to_mesa_instruction *inst = NULL; ir_to_mesa_instruction *inst = NULL;
ir->coordinate->accept(this); ir->coordinate->accept(this);
coord = this->result; coord = this->result;
if (ir->projector) {
ir->projector->accept(this);
projector = this->result;
}
/* Storage for our result. Ideally for an assignment we'd be using /* Storage for our result. Ideally for an assignment we'd be using
* the actual storage for the result here, instead. * the actual storage for the result here, instead.
*/ */
@@ -1302,7 +1307,16 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
switch (ir->op) { switch (ir->op) {
case ir_tex: case ir_tex:
inst = ir_to_mesa_emit_op1(ir, OPCODE_TEX, result_dst, coord); if (ir->projector) {
/* Compute new coord as vec4(texcoord.xyz, projector) */
ir_to_mesa_emit_op1(ir, OPCODE_MOV, result_dst, coord);
result_dst.writemask = WRITEMASK_W;
ir_to_mesa_emit_op1(ir, OPCODE_MOV, result_dst, projector);
result_dst.writemask = WRITEMASK_XYZW;
inst = ir_to_mesa_emit_op1(ir, OPCODE_TXP, result_dst, result_src);
} else {
inst = ir_to_mesa_emit_op1(ir, OPCODE_TEX, result_dst, coord);
}
break; break;
case ir_txb: case ir_txb:
/* Mesa IR stores bias in the last channel of the coords. */ /* Mesa IR stores bias in the last channel of the coords. */
@@ -1312,6 +1326,7 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
ir_to_mesa_emit_op1(ir, OPCODE_MOV, lod_info, this->result); ir_to_mesa_emit_op1(ir, OPCODE_MOV, lod_info, this->result);
inst = ir_to_mesa_emit_op1(ir, OPCODE_TXB, result_dst, coord); inst = ir_to_mesa_emit_op1(ir, OPCODE_TXB, result_dst, coord);
assert(!ir->projector); /* FINISHME */
break; break;
case ir_txl: case ir_txl:
/* Mesa IR stores lod in the last channel of the coords. */ /* Mesa IR stores lod in the last channel of the coords. */
@@ -1321,6 +1336,7 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
ir_to_mesa_emit_op1(ir, OPCODE_MOV, lod_info, this->result); ir_to_mesa_emit_op1(ir, OPCODE_MOV, lod_info, this->result);
inst = ir_to_mesa_emit_op1(ir, OPCODE_TXL, result_dst, coord); inst = ir_to_mesa_emit_op1(ir, OPCODE_TXL, result_dst, coord);
assert(!ir->projector); /* FINISHME */
break; break;
case ir_txd: case ir_txd:
case ir_txf: case ir_txf:
@@ -1354,7 +1370,6 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
assert(!"FINISHME: other texture targets"); assert(!"FINISHME: other texture targets");
} }
assert(!ir->projector); /* FINISHME */
assert(!ir->shadow_comparitor); /* FINISHME */ assert(!ir->shadow_comparitor); /* FINISHME */
this->result = result_src; this->result = result_src;