aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/ir_to_mesa.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-20 10:51:44 +0200
committermarha <marha@users.sourceforge.net>2011-09-20 10:51:44 +0200
commit5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch)
treeb7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /mesalib/src/mesa/program/ir_to_mesa.cpp
parent97f357506241a5314de9071befcd01be731f1dbb (diff)
parent0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff)
downloadvcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz
vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2
vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/program/ir_to_mesa.cpp')
-rw-r--r--mesalib/src/mesa/program/ir_to_mesa.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index 69a84de39..5e565e4ed 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -2139,6 +2139,8 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
ir->lod_info.bias->accept(this);
lod_info = this->result;
break;
+ case ir_txf:
+ /* Pretend to be TXL so the sampler, coordinate, lod are available */
case ir_txl:
opcode = OPCODE_TXL;
ir->lod_info.lod->accept(this);
@@ -2151,9 +2153,6 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
ir->lod_info.grad.dPdy->accept(this);
dy = this->result;
break;
- case ir_txf:
- assert(!"GLSL 1.30 features unsupported");
- break;
}
const glsl_type *sampler_type = ir->sampler->type;