2019-12-15 18:03:49 +01:00
|
|
|
/*
|
|
|
|
|
* Copyright 2018-2019 Collabora Ltd.
|
|
|
|
|
*
|
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
|
* on the rights to use, copy, modify, merge, publish, distribute, sub
|
|
|
|
|
* license, and/or sell copies of the Software, and to permit persons to whom
|
|
|
|
|
* the Software is furnished to do so, subject to the following conditions:
|
|
|
|
|
*
|
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
|
* Software.
|
|
|
|
|
*
|
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
|
* THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
|
|
|
|
|
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|
|
|
|
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
|
|
|
|
* USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "nir_builder.h"
|
|
|
|
|
|
2021-08-09 15:12:48 +02:00
|
|
|
static bool
|
treewide: Use nir_shader_intrinsic_pass sometimes
This converts a lot of trivial passes. Nice boilerplate deletion. Via Coccinelle
patch (with a small manual fix-up for panfrost where coccinelle got confused by
genxml + ninja clang-format squashed in, and for Zink because my semantic patch
was slightly buggy).
@def@
typedef bool;
typedef nir_builder;
typedef nir_instr;
typedef nir_def;
identifier fn, instr, intr, x, builder, data;
@@
static fn(nir_builder* builder,
-nir_instr *instr,
+nir_intrinsic_instr *intr,
...)
{
(
- if (instr->type != nir_instr_type_intrinsic)
- return false;
- nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
|
- nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
- if (instr->type != nir_instr_type_intrinsic)
- return false;
)
<...
(
-instr->x
+intr->instr.x
|
-instr
+&intr->instr
)
...>
}
@pass depends on def@
identifier def.fn;
expression shader, progress;
@@
(
-nir_shader_instructions_pass(shader, fn,
+nir_shader_intrinsics_pass(shader, fn,
...)
|
-NIR_PASS_V(shader, nir_shader_instructions_pass, fn,
+NIR_PASS_V(shader, nir_shader_intrinsics_pass, fn,
...)
|
-NIR_PASS(progress, shader, nir_shader_instructions_pass, fn,
+NIR_PASS(progress, shader, nir_shader_intrinsics_pass, fn,
...)
)
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24852>
2023-08-23 12:48:10 -04:00
|
|
|
lower_pos_write(nir_builder *b, nir_intrinsic_instr *intr,
|
|
|
|
|
UNUSED void *cb_data)
|
2019-12-15 18:03:49 +01:00
|
|
|
{
|
|
|
|
|
if (intr->intrinsic != nir_intrinsic_store_deref)
|
2021-08-09 15:12:48 +02:00
|
|
|
return false;
|
2019-12-15 18:03:49 +01:00
|
|
|
|
|
|
|
|
nir_variable *var = nir_intrinsic_get_var(intr, 0);
|
|
|
|
|
if (var->data.mode != nir_var_shader_out ||
|
|
|
|
|
var->data.location != VARYING_SLOT_POS)
|
2021-08-09 15:12:48 +02:00
|
|
|
return false;
|
2019-12-15 18:03:49 +01:00
|
|
|
|
|
|
|
|
b->cursor = nir_before_instr(&intr->instr);
|
|
|
|
|
|
2023-09-15 10:57:20 -04:00
|
|
|
nir_def *pos = intr->src[1].ssa;
|
2023-08-12 16:17:15 -04:00
|
|
|
nir_def *def = nir_vec4(b,
|
|
|
|
|
nir_channel(b, pos, 0),
|
|
|
|
|
nir_channel(b, pos, 1),
|
|
|
|
|
nir_fmul_imm(b,
|
|
|
|
|
nir_fadd(b,
|
|
|
|
|
nir_channel(b, pos, 2),
|
|
|
|
|
nir_channel(b, pos, 3)),
|
|
|
|
|
0.5),
|
|
|
|
|
nir_channel(b, pos, 3));
|
2023-08-17 16:27:15 -05:00
|
|
|
nir_src_rewrite(intr->src + 1, def);
|
2021-08-09 15:12:48 +02:00
|
|
|
return true;
|
2019-12-15 18:03:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
nir_lower_clip_halfz(nir_shader *shader)
|
|
|
|
|
{
|
2020-07-08 12:43:23 -04:00
|
|
|
if (shader->info.stage != MESA_SHADER_VERTEX &&
|
2020-07-17 09:46:47 -04:00
|
|
|
shader->info.stage != MESA_SHADER_GEOMETRY &&
|
|
|
|
|
shader->info.stage != MESA_SHADER_TESS_EVAL)
|
2019-12-15 18:03:49 +01:00
|
|
|
return;
|
|
|
|
|
|
treewide: Use nir_shader_intrinsic_pass sometimes
This converts a lot of trivial passes. Nice boilerplate deletion. Via Coccinelle
patch (with a small manual fix-up for panfrost where coccinelle got confused by
genxml + ninja clang-format squashed in, and for Zink because my semantic patch
was slightly buggy).
@def@
typedef bool;
typedef nir_builder;
typedef nir_instr;
typedef nir_def;
identifier fn, instr, intr, x, builder, data;
@@
static fn(nir_builder* builder,
-nir_instr *instr,
+nir_intrinsic_instr *intr,
...)
{
(
- if (instr->type != nir_instr_type_intrinsic)
- return false;
- nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
|
- nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
- if (instr->type != nir_instr_type_intrinsic)
- return false;
)
<...
(
-instr->x
+intr->instr.x
|
-instr
+&intr->instr
)
...>
}
@pass depends on def@
identifier def.fn;
expression shader, progress;
@@
(
-nir_shader_instructions_pass(shader, fn,
+nir_shader_intrinsics_pass(shader, fn,
...)
|
-NIR_PASS_V(shader, nir_shader_instructions_pass, fn,
+NIR_PASS_V(shader, nir_shader_intrinsics_pass, fn,
...)
|
-NIR_PASS(progress, shader, nir_shader_instructions_pass, fn,
+NIR_PASS(progress, shader, nir_shader_intrinsics_pass, fn,
...)
)
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24852>
2023-08-23 12:48:10 -04:00
|
|
|
nir_shader_intrinsics_pass(shader, lower_pos_write,
|
2021-08-09 15:12:48 +02:00
|
|
|
nir_metadata_block_index |
|
2023-08-08 12:00:35 -05:00
|
|
|
nir_metadata_dominance,
|
2021-08-09 15:12:48 +02:00
|
|
|
NULL);
|
2019-12-15 18:03:49 +01:00
|
|
|
}
|