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

intel/fs: Rework emit_samplepos_setup()

Browse Source 
This rolls compute_sample_position into emit_samplepos_setup, its only
caller, by using a loop instead of calling it twice.  We also
early-return for the !persample_dispatch case instead of doing it as
part of the sample calculation.  This means that we don't call
fetch_payload_reg() to get sample_pos_reg unless we're actually going to
use it so the function is safe to call even if we haven't set up
sample_pos_reg.  This will be important for the next commit.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14198>
This commit is contained in:
Jason Ekstrand
2021-12-02 14:25:12 -06:00
committed by Marge Bot
parent ac7255ed1e
commit a580fd55e1
2 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/intel/compiler/brw_fs.cpp
View File

@@ -1275,38 +1275,26 @@ fs_visitor::emit_frontfacing_interpolation()
return ff; return ff;
} }
void fs_reg
fs_visitor::compute_sample_position(fs_reg dst, fs_reg int_sample_pos) fs_visitor::emit_samplepos_setup()
{ {
assert(stage == MESA_SHADER_FRAGMENT); assert(stage == MESA_SHADER_FRAGMENT);
struct brw_wm_prog_data *wm_prog_data = brw_wm_prog_data(this->prog_data); struct brw_wm_prog_data *wm_prog_data = brw_wm_prog_data(this->prog_data);
assert(dst.type == BRW_REGISTER_TYPE_F); assert(devinfo->ver >= 6);
if (wm_prog_data->persample_dispatch) { const fs_builder abld = bld.annotate("compute sample position");
/* Convert int_sample_pos to floating point */ fs_reg pos = abld.vgrf(BRW_REGISTER_TYPE_F, 2);
bld.MOV(dst, int_sample_pos);
/* Scale to the range [0, 1] */ if (!wm_prog_data->persample_dispatch) {
bld.MUL(dst, dst, brw_imm_f(1 / 16.0f));
}
else {
/* From ARB_sample_shading specification: /* From ARB_sample_shading specification:
* "When rendering to a non-multisample buffer, or if multisample * "When rendering to a non-multisample buffer, or if multisample
* rasterization is disabled, gl_SamplePosition will always be * rasterization is disabled, gl_SamplePosition will always be
* (0.5, 0.5). * (0.5, 0.5).
*/ */
bld.MOV(dst, brw_imm_f(0.5f)); bld.MOV(offset(pos, bld, 0), brw_imm_f(0.5f));
bld.MOV(offset(pos, bld, 1), brw_imm_f(0.5f));
return pos;
} }
}
fs_reg
fs_visitor::emit_samplepos_setup()
{
assert(devinfo->ver >= 6);
const fs_builder abld = bld.annotate("compute sample position");
fs_reg pos = abld.vgrf(BRW_REGISTER_TYPE_F, 2);
fs_reg int_sample_x = vgrf(glsl_type::int_type);
fs_reg int_sample_y = vgrf(glsl_type::int_type);
/* WM will be run in MSDISPMODE_PERSAMPLE. So, only one of SIMD8 or SIMD16 /* WM will be run in MSDISPMODE_PERSAMPLE. So, only one of SIMD8 or SIMD16
* mode will be enabled. * mode will be enabled.
@@ -1322,13 +1310,16 @@ fs_visitor::emit_samplepos_setup()
const fs_reg sample_pos_reg = const fs_reg sample_pos_reg =
fetch_payload_reg(abld, payload.sample_pos_reg, BRW_REGISTER_TYPE_W); fetch_payload_reg(abld, payload.sample_pos_reg, BRW_REGISTER_TYPE_W);
/* Compute gl_SamplePosition.x */ for (unsigned i = 0; i < 2; i++) {
abld.MOV(int_sample_x, subscript(sample_pos_reg, BRW_REGISTER_TYPE_B, 0)); fs_reg tmp_d = bld.vgrf(BRW_REGISTER_TYPE_D);
compute_sample_position(offset(pos, abld, 0), int_sample_x); abld.MOV(tmp_d, subscript(sample_pos_reg, BRW_REGISTER_TYPE_B, i));
/* Convert int_sample_pos to floating point */
fs_reg tmp_f = bld.vgrf(BRW_REGISTER_TYPE_F);
abld.MOV(tmp_f, tmp_d);
/* Scale to the range [0, 1] */
abld.MUL(offset(pos, abld, i), tmp_f, brw_imm_f(1 / 16.0f));
}
/* Compute gl_SamplePosition.y */
abld.MOV(int_sample_y, subscript(sample_pos_reg, BRW_REGISTER_TYPE_B, 1));
compute_sample_position(offset(pos, abld, 1), int_sample_y);
return pos; return pos;
} }

1
src/intel/compiler/brw_fs.h
View File

@@ -209,7 +209,6 @@ public:
fs_reg emit_shading_rate_setup(); fs_reg emit_shading_rate_setup();
void emit_interpolation_setup_gfx4(); void emit_interpolation_setup_gfx4();
void emit_interpolation_setup_gfx6(); void emit_interpolation_setup_gfx6();
void compute_sample_position(fs_reg dst, fs_reg int_sample_pos);
fs_reg emit_mcs_fetch(const fs_reg &coordinate, unsigned components, fs_reg emit_mcs_fetch(const fs_reg &coordinate, unsigned components,
const fs_reg &texture, const fs_reg &texture,
const fs_reg &texture_handle); const fs_reg &texture_handle);