OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_input_attachments: Refactor to use an options struct

Browse Source 
While we're at it, fold the details of how to load the fragcoord into
load_fragcoord().

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5719>
This commit is contained in:
Connor Abbott
2020-07-01 16:55:46 +02:00
committed by Marge Bot
parent 340c73d4ef
commit e72895767b
5 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/nir/nir.h
View File

@@ -4458,7 +4458,12 @@ enum nir_lower_idiv_path {
bool nir_lower_idiv(nir_shader *shader, enum nir_lower_idiv_path path);
bool nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval);
typedef struct nir_input_attachment_options {
bool use_fragcoord_sysval;
} nir_input_attachment_options;
bool nir_lower_input_attachments(nir_shader *shader,
const nir_input_attachment_options *options);
bool nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables,
bool use_vars,

22
src/compiler/nir/nir_lower_input_attachments.c
View File

@@ -25,8 +25,11 @@
#include "nir_builder.h"
static nir_ssa_def *
load_frag_coord(nir_builder *b)
load_frag_coord(const nir_input_attachment_options *options, nir_builder *b)
{
if (options->use_fragcoord_sysval)
return nir_load_frag_coord(b);
nir_variable *pos =
nir_find_variable_with_location(b->shader, nir_var_shader_in,
VARYING_SLOT_POS);
@@ -49,7 +52,7 @@ load_frag_coord(nir_builder *b)
static bool
try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
bool use_fragcoord_sysval)
const nir_input_attachment_options *options)
{
nir_deref_instr *deref = nir_src_as_deref(load->src[0]);
assert(glsl_type_is_image(deref->type));
@@ -65,8 +68,7 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
nir_builder_init(&b, impl);
b.cursor = nir_instr_remove(&load->instr);
nir_ssa_def *frag_coord = use_fragcoord_sysval ? nir_load_frag_coord(&b)
: load_frag_coord(&b);
nir_ssa_def *frag_coord = load_frag_coord(options, &b);
frag_coord = nir_f2i32(&b, frag_coord);
nir_ssa_def *offset = nir_ssa_for_src(&b, load->src[1], 2);
nir_ssa_def *pos = nir_iadd(&b, frag_coord, offset);
@@ -128,7 +130,7 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
static bool
try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
bool use_fragcoord_sysval)
const nir_input_attachment_options *options)
{
nir_deref_instr *deref = nir_src_as_deref(tex->src[0].src);
@@ -139,8 +141,7 @@ try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
nir_builder_init(&b, impl);
b.cursor = nir_before_instr(&tex->instr);
nir_ssa_def *frag_coord = use_fragcoord_sysval ? nir_load_frag_coord(&b)
: load_frag_coord(&b);
nir_ssa_def *frag_coord = load_frag_coord(options, &b);
frag_coord = nir_f2i32(&b, frag_coord);
nir_ssa_def *layer = nir_load_layer_id(&b);
@@ -155,7 +156,8 @@ try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
}
bool
nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval)
nir_lower_input_attachments(nir_shader *shader,
const nir_input_attachment_options *options)
{
assert(shader->info.stage == MESA_SHADER_FRAGMENT);
bool progress = false;
@@ -173,7 +175,7 @@ nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval)
if (tex->op == nir_texop_fragment_mask_fetch ||
tex->op == nir_texop_fragment_fetch) {
progress |= try_lower_input_texop(function->impl, tex,
use_fragcoord_sysval);
options);
}
break;
}
@@ -182,7 +184,7 @@ nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval)
if (load->intrinsic == nir_intrinsic_image_deref_load) {
progress |= try_lower_input_load(function->impl, load,
use_fragcoord_sysval);
options);
}
break;
}