From 5189f0243a3dd8698c645bbe762b8a1a3caaf1a9 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sun, 29 May 2016 10:49:03 -0400 Subject: [PATCH] mesa: hook up core bits of GL_ARB_shader_group_vote Signed-off-by: Ilia Mirkin Reviewed-by: Ian Romanick Reviewed-by: Dave Airlie --- src/compiler/glsl/builtin_functions.cpp | 22 +++++++++++++++++++ src/compiler/glsl/glcpp/glcpp-parse.y | 3 +++ src/compiler/glsl/glsl_parser_extras.cpp | 1 + src/compiler/glsl/glsl_parser_extras.h | 2 ++ src/compiler/glsl/ir.cpp | 9 ++++++++ src/compiler/glsl/ir.h | 9 +++++++- src/compiler/glsl/ir_validate.cpp | 8 +++++++ .../dri/i965/brw_fs_channel_expressions.cpp | 5 +++++ src/mesa/main/extensions_table.h | 1 + src/mesa/main/mtypes.h | 1 + src/mesa/program/ir_to_mesa.cpp | 3 +++ src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++++ 12 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index edd02bb031b..db0dcb6288f 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -528,6 +528,12 @@ barrier_supported(const _mesa_glsl_parse_state *state) state->stage == MESA_SHADER_TESS_CTRL; } +static bool +vote(const _mesa_glsl_parse_state *state) +{ + return state->ARB_shader_group_vote_enable; +} + /** @} */ /******************************************************************************/ @@ -853,6 +859,8 @@ private: ir_function_signature *_shader_clock(builtin_available_predicate avail, const glsl_type *type); + ir_function_signature *_vote(enum ir_expression_operation opcode); + #undef B0 #undef B1 #undef B2 @@ -2935,6 +2943,10 @@ builtin_builder::create_builtins() glsl_type::uvec2_type), NULL); + add_function("anyInvocationARB", _vote(ir_unop_vote_any), NULL); + add_function("allInvocationsARB", _vote(ir_unop_vote_all), NULL); + add_function("allInvocationsEqualARB", _vote(ir_unop_vote_eq), NULL); + #undef F #undef FI #undef FIUD @@ -5576,6 +5588,16 @@ builtin_builder::_shader_clock(builtin_available_predicate avail, return sig; } +ir_function_signature * +builtin_builder::_vote(enum ir_expression_operation opcode) +{ + ir_variable *value = in_var(glsl_type::bool_type, "value"); + + MAKE_SIG(glsl_type::bool_type, vote, 1, value); + body.emit(ret(expr(opcode, value))); + return sig; +} + /** @} */ /******************************************************************************/ diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index 402272796d0..2cfa6a6825a 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -2467,6 +2467,9 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio if (extensions->ARB_cull_distance) add_builtin_define(parser, "GL_ARB_cull_distance", 1); + + if (extensions->ARB_shader_group_vote) + add_builtin_define(parser, "GL_ARB_shader_group_vote", 1); } } diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index ba658aec23f..fde8c193597 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -594,6 +594,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(ARB_shader_bit_encoding, true, false, ARB_shader_bit_encoding), EXT(ARB_shader_clock, true, false, ARB_shader_clock), EXT(ARB_shader_draw_parameters, true, false, ARB_shader_draw_parameters), + EXT(ARB_shader_group_vote, true, false, ARB_shader_group_vote), EXT(ARB_shader_image_load_store, true, false, ARB_shader_image_load_store), EXT(ARB_shader_image_size, true, false, ARB_shader_image_size), EXT(ARB_shader_precision, true, false, ARB_shader_precision), diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index a0c19033ac6..8c43292d8aa 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -575,6 +575,8 @@ struct _mesa_glsl_parse_state { bool ARB_shader_clock_warn; bool ARB_shader_draw_parameters_enable; bool ARB_shader_draw_parameters_warn; + bool ARB_shader_group_vote_enable; + bool ARB_shader_group_vote_warn; bool ARB_shader_image_load_store_enable; bool ARB_shader_image_load_store_warn; bool ARB_shader_image_size_enable; diff --git a/src/compiler/glsl/ir.cpp b/src/compiler/glsl/ir.cpp index 5bb3ac3c214..7961f00ffd1 100644 --- a/src/compiler/glsl/ir.cpp +++ b/src/compiler/glsl/ir.cpp @@ -341,6 +341,12 @@ ir_expression::ir_expression(int op, ir_rvalue *op0) this->type = glsl_type::int_type; break; + case ir_unop_vote_any: + case ir_unop_vote_all: + case ir_unop_vote_eq: + this->type = glsl_type::bool_type; + break; + default: assert(!"not reached: missing automatic type setup for ir_expression"); this->type = op0->type; @@ -563,6 +569,9 @@ static const char *const operator_strs[] = { "interpolate_at_centroid", "get_buffer_size", "ssbo_unsized_array_length", + "vote_any", + "vote_all", + "vote_eq", "+", "-", "*", diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index 2afa94cf170..36293563e25 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -1481,10 +1481,17 @@ enum ir_expression_operation { */ ir_unop_ssbo_unsized_array_length, + /** + * Vote among threads on the value of the boolean argument. + */ + ir_unop_vote_any, + ir_unop_vote_all, + ir_unop_vote_eq, + /** * A sentinel marking the last of the unary operations. */ - ir_last_unop = ir_unop_ssbo_unsized_array_length, + ir_last_unop = ir_unop_vote_eq, ir_binop_add, ir_binop_sub, diff --git a/src/compiler/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp index 757f17cbf38..126f9bf227a 100644 --- a/src/compiler/glsl/ir_validate.cpp +++ b/src/compiler/glsl/ir_validate.cpp @@ -453,6 +453,14 @@ ir_validate::visit_leave(ir_expression *ir) assert(ir->operands[0]->type->base_type == GLSL_TYPE_SUBROUTINE); assert(ir->type->base_type == GLSL_TYPE_INT); break; + + case ir_unop_vote_any: + case ir_unop_vote_all: + case ir_unop_vote_eq: + assert(ir->type == glsl_type::bool_type); + assert(ir->operands[0]->type == glsl_type::bool_type); + break; + case ir_binop_add: case ir_binop_sub: case ir_binop_mul: diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp index 3d2e61963d8..5eac8d4fff3 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -433,6 +433,11 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir) case ir_unop_frexp_sig: case ir_unop_frexp_exp: unreachable("should have been lowered by lower_instructions"); + + case ir_unop_vote_any: + case ir_unop_vote_all: + case ir_unop_vote_eq: + unreachable("unsupported"); } ir->remove(); diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 7dd025afb8b..ea8eb306f59 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -105,6 +105,7 @@ EXT(ARB_shader_atomic_counters , ARB_shader_atomic_counters EXT(ARB_shader_bit_encoding , ARB_shader_bit_encoding , GLL, GLC, x , x , 2010) EXT(ARB_shader_clock , ARB_shader_clock , GLL, GLC, x , x , 2015) EXT(ARB_shader_draw_parameters , ARB_shader_draw_parameters , GLL, GLC, x , x , 2013) +EXT(ARB_shader_group_vote , ARB_shader_group_vote , GLL, GLC, x , x , 2013) EXT(ARB_shader_image_load_store , ARB_shader_image_load_store , GLL, GLC, x , x , 2011) EXT(ARB_shader_image_size , ARB_shader_image_size , GLL, GLC, x , x , 2012) EXT(ARB_shader_objects , dummy_true , GLL, GLC, x , x , 2002) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 0f9b01dd477..471d41d4435 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3834,6 +3834,7 @@ struct gl_extensions GLboolean ARB_shader_bit_encoding; GLboolean ARB_shader_clock; GLboolean ARB_shader_draw_parameters; + GLboolean ARB_shader_group_vote; GLboolean ARB_shader_image_load_store; GLboolean ARB_shader_image_size; GLboolean ARB_shader_precision; diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 7f24a9e16e4..b10648ba9d9 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -1375,6 +1375,9 @@ ir_to_mesa_visitor::visit(ir_expression *ir) case ir_unop_dFdy_fine: case ir_unop_subroutine_to_int: case ir_unop_get_buffer_size: + case ir_unop_vote_any: + case ir_unop_vote_all: + case ir_unop_vote_eq: assert(!"not supported"); break; diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 06eb6f159b0..92b0f8c9a16 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -2251,6 +2251,10 @@ glsl_to_tgsi_visitor::visit_expression(ir_expression* ir, st_src_reg *op) case ir_binop_carry: case ir_binop_borrow: case ir_unop_ssbo_unsized_array_length: + + case ir_unop_vote_any: + case ir_unop_vote_all: + case ir_unop_vote_eq: /* This operation is not supported, or should have already been handled. */ assert(!"Invalid ir opcode in glsl_to_tgsi_visitor::visit()"); -- 2.30.2