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

glsl: add ARB_bindless_texture operations 

For the explicit pack/unpack conversions.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Samuel Pitoiset 2017-04-21 14:35:32 +02:00
parent 35c8e727a5
commit 1eff26f02d
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/glsl/ir_expression_operation.py
View File

@ -543,6 +543,12 @@ ir_expression_operation = [
operation("pack_double_2x32", 1, printable_name="packDouble2x32", source_types=(uint_type,), dest_type=double_type, c_expression="memcpy(&data.d[0], &op[0]->value.u[0], sizeof(double))", flags=frozenset((horizontal_operation, non_assign_operation))),
operation("unpack_double_2x32", 1, printable_name="unpackDouble2x32", source_types=(double_type,), dest_type=uint_type, c_expression="memcpy(&data.u[0], &op[0]->value.d[0], sizeof(double))", flags=frozenset((horizontal_operation, non_assign_operation))),
# Sampler/Image packing, part of ARB_bindless_texture.
operation("pack_sampler_2x32", 1, printable_name="packSampler2x32", source_types=(uint_type,), dest_type=uint64_type, c_expression="memcpy(&data.u64[0], &op[0]->value.u[0], sizeof(uint64_t))", flags=frozenset((horizontal_operation, non_assign_operation))),
operation("pack_image_2x32", 1, printable_name="packImage2x32", source_types=(uint_type,), dest_type=uint64_type, c_expression="memcpy(&data.u64[0], &op[0]->value.u[0], sizeof(uint64_t))", flags=frozenset((horizontal_operation, non_assign_operation))),
operation("unpack_sampler_2x32", 1, printable_name="unpackSampler2x32", source_types=(uint64_type,), dest_type=uint_type, c_expression="memcpy(&data.u[0], &op[0]->value.u64[0], sizeof(uint64_t))", flags=frozenset((horizontal_operation, non_assign_operation))),
operation("unpack_image_2x32", 1, printable_name="unpackImage2x32", source_types=(uint64_type,), dest_type=uint_type, c_expression="memcpy(&data.u[0], &op[0]->value.u64[0], sizeof(uint64_t))", flags=frozenset((horizontal_operation, non_assign_operation))),
operation("frexp_sig", 1),
operation("frexp_exp", 1),

20
src/compiler/glsl/ir_validate.cpp
View File

@ -477,6 +477,16 @@ ir_validate::visit_leave(ir_expression *ir)
assert(ir->operands[0]->type == glsl_type::uvec2_type);
break;
case ir_unop_pack_sampler_2x32:
assert(ir->type->is_sampler());
assert(ir->operands[0]->type == glsl_type::uvec2_type);
break;
case ir_unop_pack_image_2x32:
assert(ir->type->is_image());
assert(ir->operands[0]->type == glsl_type::uvec2_type);
break;
case ir_unop_unpack_snorm_2x16:
case ir_unop_unpack_unorm_2x16:
case ir_unop_unpack_half_2x16:
@ -505,6 +515,16 @@ ir_validate::visit_leave(ir_expression *ir)
assert(ir->operands[0]->type == glsl_type::uint64_t_type);
break;
case ir_unop_unpack_sampler_2x32:
assert(ir->type == glsl_type::uvec2_type);
assert(ir->operands[0]->type->is_sampler());
break;
case ir_unop_unpack_image_2x32:
assert(ir->type == glsl_type::uvec2_type);
assert(ir->operands[0]->type->is_image());
break;
case ir_unop_bitfield_reverse:
assert(ir->operands[0]->type == ir->type);
assert(ir->type->is_integer());

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

@ -1417,6 +1417,10 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
case ir_unop_unpack_int_2x32:
case ir_unop_pack_uint_2x32:
case ir_unop_unpack_uint_2x32:
case ir_unop_pack_sampler_2x32:
case ir_unop_unpack_sampler_2x32:
case ir_unop_pack_image_2x32:
case ir_unop_unpack_image_2x32:
assert(!"not supported");
break;

5
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@ -2486,6 +2486,11 @@ glsl_to_tgsi_visitor::visit_expression(ir_expression* ir, st_src_reg *op)
case ir_unop_unpack_snorm_4x8:
case ir_unop_unpack_unorm_4x8:
case ir_unop_unpack_sampler_2x32:
case ir_unop_pack_sampler_2x32:
case ir_unop_unpack_image_2x32:
case ir_unop_pack_image_2x32:
case ir_quadop_vector:
case ir_binop_vector_extract:
case ir_triop_vector_insert: