diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-27 23:23:05 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-27 23:23:05 -0800 |
| commit | ea77b384e8c575922eca1c05398e19fcbfda9b09 (patch) | |
| tree | 4f8659bd8b48af785896daa224f6698a5ee269ec /src/glsl/ir.cpp | |
| parent | f948767471ba83427cbcdc244a511fbb954ca9e0 (diff) | |
| parent | 109c348284843054f708f4403260739b7db18275 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
This pulls in tessellation and the store_var changes that go with it.
Diffstat (limited to 'src/glsl/ir.cpp')
| -rw-r--r-- | src/glsl/ir.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index f989e9b6dff..70227070ca7 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -307,10 +307,6 @@ ir_expression::ir_expression(int op, ir_rvalue *op0) this->type = glsl_type::uvec2_type; break; - case ir_unop_any: - this->type = glsl_type::bool_type; - break; - case ir_unop_pack_snorm_2x16: case ir_unop_pack_snorm_4x8: case ir_unop_pack_unorm_2x16: @@ -538,7 +534,6 @@ static const char *const operator_strs[] = { "bitcast_f2i", "bitcast_u2f", "bitcast_f2u", - "any", "trunc", "ceil", "floor", |