KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: Extend ir_expression_operation for ARB_shading_language_packing 

For each function {pack,unpack}{Snorm,Unorm}4x8, add a corresponding
opcode to enum ir_expression_operation. Validate the new opcodes in
ir_validate.cpp.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Matt Turner 2013-01-21 14:12:37 -08:00
parent b0239ce960
commit b64b174b0a
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/glsl/ir.cpp
View File

@ -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",

4
src/glsl/ir.h
View File

@ -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,
/*@}*/

12
src/glsl/ir_validate.cpp
View File

@ -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);

4
src/mesa/program/ir_to_mesa.cpp
View File

@ -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: