diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/ir.cpp | 11 | ||||
| -rw-r--r-- | src/glsl/ir.h | 4 | ||||
| -rw-r--r-- | src/glsl/ir_validate.cpp | 12 | ||||
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 4 |
4 files changed, 31 insertions, 0 deletions
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index 4c5115b98cf..954995db387 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -316,7 +316,9 @@ ir_expression::ir_expression(int op, ir_rvalue *op0) break; case ir_unop_pack_snorm_2x16: + case ir_unop_pack_snorm_4x8: case ir_unop_pack_unorm_2x16: + case ir_unop_pack_unorm_4x8: case ir_unop_pack_half_2x16: this->type = glsl_type::uint_type; break; @@ -327,6 +329,11 @@ ir_expression::ir_expression(int op, ir_rvalue *op0) this->type = glsl_type::vec2_type; break; + case ir_unop_unpack_snorm_4x8: + case ir_unop_unpack_unorm_4x8: + this->type = glsl_type::vec4_type; + break; + default: assert(!"not reached: missing automatic type setup for ir_expression"); this->type = op0->type; @@ -478,10 +485,14 @@ static const char *const operator_strs[] = { "dFdx", "dFdy", "packSnorm2x16", + "packSnorm4x8", "packUnorm2x16", + "packUnorm4x8", "packHalf2x16", "unpackSnorm2x16", + "unpackSnorm4x8", "unpackUnorm2x16", + "unpackUnorm4x8", "unpackHalf2x16", "unpackHalf2x16_split_x", "unpackHalf2x16_split_y", diff --git a/src/glsl/ir.h b/src/glsl/ir.h index cb96a200aa9..efd80dad894 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -1009,10 +1009,14 @@ enum ir_expression_operation { */ /*@{*/ ir_unop_pack_snorm_2x16, + ir_unop_pack_snorm_4x8, ir_unop_pack_unorm_2x16, + ir_unop_pack_unorm_4x8, ir_unop_pack_half_2x16, ir_unop_unpack_snorm_2x16, + ir_unop_unpack_snorm_4x8, ir_unop_unpack_unorm_2x16, + ir_unop_unpack_unorm_4x8, ir_unop_unpack_half_2x16, /*@}*/ diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp index 816f7d3ec10..d8cafd55f07 100644 --- a/src/glsl/ir_validate.cpp +++ b/src/glsl/ir_validate.cpp @@ -336,6 +336,12 @@ ir_validate::visit_leave(ir_expression *ir) assert(ir->operands[0]->type == glsl_type::vec2_type); break; + case ir_unop_pack_snorm_4x8: + case ir_unop_pack_unorm_4x8: + assert(ir->type == glsl_type::uint_type); + assert(ir->operands[0]->type == glsl_type::vec4_type); + break; + case ir_unop_unpack_snorm_2x16: case ir_unop_unpack_unorm_2x16: case ir_unop_unpack_half_2x16: @@ -343,6 +349,12 @@ ir_validate::visit_leave(ir_expression *ir) assert(ir->operands[0]->type == glsl_type::uint_type); break; + case ir_unop_unpack_snorm_4x8: + case ir_unop_unpack_unorm_4x8: + assert(ir->type == glsl_type::vec4_type); + assert(ir->operands[0]->type == glsl_type::uint_type); + break; + case ir_unop_unpack_half_2x16_split_x: case ir_unop_unpack_half_2x16_split_y: assert(ir->type == glsl_type::float_type); diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index b197ad34437..cd89171dabe 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -1432,10 +1432,14 @@ ir_to_mesa_visitor::visit(ir_expression *ir) emit(ir, OPCODE_FRC, result_dst, op[0]); break; case ir_unop_pack_snorm_2x16: + case ir_unop_pack_snorm_4x8: case ir_unop_pack_unorm_2x16: + case ir_unop_pack_unorm_4x8: case ir_unop_pack_half_2x16: case ir_unop_unpack_snorm_2x16: + case ir_unop_unpack_snorm_4x8: case ir_unop_unpack_unorm_2x16: + case ir_unop_unpack_unorm_4x8: case ir_unop_unpack_half_2x16: case ir_unop_unpack_half_2x16_split_x: case ir_unop_unpack_half_2x16_split_y: |