[Mesa-dev] [PATCH 1/2] mesa: Add GL/GLSL plumbing for INTEL_fragment_shader_ordering.
Francisco Jerez
currojerez at riseup.net
Tue Aug 28 15:32:52 UTC 2018
kevin.rogovin at intel.com writes:
> From: Kevin Rogovin <kevin.rogovin at intel.com>
>
> This extension provides new GLSL built-in function
> beginFragmentShaderOrderingIntel() that guarantees
> (taking wording of GL_INTEL_fragment_shader_ordering
> extension) that any memory transactions issued by
> shader invocations from previous primitives mapped to
> same xy window coordinates (and same sample when
> per-sample shading is active), complete and are visible
> to the shader invocation that called
> beginFragmentShaderOrderingINTEL().
>
> One advantage of INTEL_fragment_shader_ordering over
> ARB_fragment_shader_interlock is that it provides a
> function that operates as a memory barrie (instead
> of a defining a critcial section) that can be called
> under arbitary control flow from any function (in
> contrast the begin/end of ARB_fragment_shader_interlock
> may only be called once, from main(), under no control
> flow.
>
> Signed-off-by: Kevin Rogovin <kevin.rogovin at intel.com>
> ---
> src/compiler/glsl/builtin_functions.cpp | 17 +++++++++++++++++
> src/compiler/glsl/glsl_parser_extras.cpp | 1 +
> src/compiler/glsl/glsl_parser_extras.h | 2 ++
> src/compiler/glsl/glsl_to_nir.cpp | 6 ++++++
> src/compiler/glsl/ir.h | 1 +
> src/compiler/nir/nir_intrinsics.py | 1 +
> src/mesa/main/extensions_table.h | 1 +
> src/mesa/main/mtypes.h | 1 +
> 8 files changed, 30 insertions(+)
>
> diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp
> index b601880686..5650365d1d 100644
> --- a/src/compiler/glsl/builtin_functions.cpp
> +++ b/src/compiler/glsl/builtin_functions.cpp
> @@ -525,6 +525,12 @@ supports_nv_fragment_shader_interlock(const _mesa_glsl_parse_state *state)
> return state->NV_fragment_shader_interlock_enable;
> }
>
> +static bool
> +supports_intel_fragment_shader_ordering(const _mesa_glsl_parse_state *state)
> +{
> + return state->INTEL_fragment_shader_ordering_enable;
> +}
> +
> static bool
> shader_clock(const _mesa_glsl_parse_state *state)
> {
> @@ -1305,6 +1311,11 @@ builtin_builder::create_intrinsics()
> supports_arb_fragment_shader_interlock,
> ir_intrinsic_end_invocation_interlock), NULL);
>
> + add_function("__intrinsic_begin_fragment_shader_ordering",
> + _invocation_interlock_intrinsic(
> + supports_intel_fragment_shader_ordering,
> + ir_intrinsic_begin_fragment_shader_ordering), NULL);
> +
> add_function("__intrinsic_shader_clock",
> _shader_clock_intrinsic(shader_clock,
> glsl_type::uvec2_type),
> @@ -3419,6 +3430,12 @@ builtin_builder::create_builtins()
> supports_nv_fragment_shader_interlock),
> NULL);
>
> + add_function("beginFragmentShaderOrderingINTEL",
> + _invocation_interlock(
> + "__intrinsic_begin_fragment_shader_ordering",
> + supports_intel_fragment_shader_ordering),
> + NULL);
> +
> add_function("anyInvocationARB",
> _vote("__intrinsic_vote_any", vote),
> NULL);
> diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
> index 0a7d0d78b1..21d4122444 100644
> --- a/src/compiler/glsl/glsl_parser_extras.cpp
> +++ b/src/compiler/glsl/glsl_parser_extras.cpp
> @@ -725,6 +725,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
> EXT_AEP(EXT_texture_buffer),
> EXT_AEP(EXT_texture_cube_map_array),
> EXT(INTEL_conservative_rasterization),
> + EXT(INTEL_fragment_shader_ordering),
> EXT(INTEL_shader_atomic_float_minmax),
> EXT(MESA_shader_integer_functions),
> EXT(NV_fragment_shader_interlock),
> diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h
> index 2c8353214a..e03b34d7d6 100644
> --- a/src/compiler/glsl/glsl_parser_extras.h
> +++ b/src/compiler/glsl/glsl_parser_extras.h
> @@ -812,6 +812,8 @@ struct _mesa_glsl_parse_state {
> bool EXT_texture_cube_map_array_warn;
> bool INTEL_conservative_rasterization_enable;
> bool INTEL_conservative_rasterization_warn;
> + bool INTEL_fragment_shader_ordering_enable;
> + bool INTEL_fragment_shader_ordering_warn;
> bool INTEL_shader_atomic_float_minmax_enable;
> bool INTEL_shader_atomic_float_minmax_warn;
> bool MESA_shader_integer_functions_enable;
> diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
> index a53000f47e..efbb2317ac 100644
> --- a/src/compiler/glsl/glsl_to_nir.cpp
> +++ b/src/compiler/glsl/glsl_to_nir.cpp
> @@ -742,6 +742,9 @@ nir_visitor::visit(ir_call *ir)
> case ir_intrinsic_end_invocation_interlock:
> op = nir_intrinsic_end_invocation_interlock;
> break;
> + case ir_intrinsic_begin_fragment_shader_ordering:
> + op = nir_intrinsic_begin_fragment_shader_ordering;
> + break;
> case ir_intrinsic_group_memory_barrier:
> op = nir_intrinsic_group_memory_barrier;
> break;
> @@ -975,6 +978,9 @@ nir_visitor::visit(ir_call *ir)
> case nir_intrinsic_end_invocation_interlock:
> nir_builder_instr_insert(&b, &instr->instr);
> break;
> + case nir_intrinsic_begin_fragment_shader_ordering:
> + nir_builder_instr_insert(&b, &instr->instr);
> + break;
> case nir_intrinsic_store_ssbo: {
> exec_node *param = ir->actual_parameters.get_head();
> ir_rvalue *block = ((ir_instruction *)param)->as_rvalue();
> diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h
> index 67b38f48ef..6f9e736cdb 100644
> --- a/src/compiler/glsl/ir.h
> +++ b/src/compiler/glsl/ir.h
> @@ -1122,6 +1122,7 @@ enum ir_intrinsic_id {
> ir_intrinsic_memory_barrier_shared,
> ir_intrinsic_begin_invocation_interlock,
> ir_intrinsic_end_invocation_interlock,
> + ir_intrinsic_begin_fragment_shader_ordering,
>
Wouldn't it make sense to implement both extensions in term of a single
intrinsic e.g. ir_intrinsic_fragment_interlock_barrier so back-ends get
support for the three roughly equivalent extensions by only implementing
one intrinsic?
> ir_intrinsic_vote_all,
> ir_intrinsic_vote_any,
> diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
> index 8c9bc3bbc9..67d336fd53 100644
> --- a/src/compiler/nir/nir_intrinsics.py
> +++ b/src/compiler/nir/nir_intrinsics.py
> @@ -191,6 +191,7 @@ barrier("memory_barrier_image")
> barrier("memory_barrier_shared")
> barrier("begin_invocation_interlock")
> barrier("end_invocation_interlock")
> +barrier("begin_fragment_shader_ordering")
>
> # A conditional discard, with a single boolean source.
> intrinsic("discard_if", src_comp=[1])
> diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
> index 115af796bc..7072fa46ad 100644
> --- a/src/mesa/main/extensions_table.h
> +++ b/src/mesa/main/extensions_table.h
> @@ -316,6 +316,7 @@ EXT(IBM_texture_mirrored_repeat , dummy_true
> EXT(INGR_blend_func_separate , EXT_blend_func_separate , GLL, x , x , x , 1999)
>
> EXT(INTEL_conservative_rasterization , INTEL_conservative_rasterization , x , GLC, x , 31, 2013)
> +EXT(INTEL_fragment_shader_ordering , INTEL_fragment_shader_ordering , GLL, GLC, x , x , 2013)
> EXT(INTEL_performance_query , INTEL_performance_query , GLL, GLC, x , ES2, 2013)
> EXT(INTEL_shader_atomic_float_minmax , INTEL_shader_atomic_float_minmax , GLL, GLC, x , x , 2018)
>
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 9d058cef6d..f247b125e7 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -4271,6 +4271,7 @@ struct gl_extensions
> GLboolean ATI_fragment_shader;
> GLboolean GREMEDY_string_marker;
> GLboolean INTEL_conservative_rasterization;
> + GLboolean INTEL_fragment_shader_ordering;
> GLboolean INTEL_performance_query;
> GLboolean INTEL_shader_atomic_float_minmax;
> GLboolean KHR_blend_equation_advanced;
> --
> 2.17.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180828/d9ac30b7/attachment.sig>
More information about the mesa-dev
mailing list