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

r600/sfn: Acquire the number of FS outputs and the write_all info early

Browse Source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6814>
This commit is contained in:
Gert Wollny
2020-09-22 09:21:53 +02:00
committed by Marge Bot
parent c2c5f71e96
commit 2abb9e5ac0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
View File

@@ -321,13 +321,18 @@ bool FragmentShaderFromNir::do_process_outputs(nir_variable *output)
int loc = output->data.location; int loc = output->data.location;
if (loc == FRAG_RESULT_COLOR && if (loc == FRAG_RESULT_COLOR &&
(m_nir.info.outputs_written & (1ull << loc))) { (m_nir.info.outputs_written & (1ull << loc)) &&
!m_dual_source_blend) {
sh_info().fs_write_all = true; sh_info().fs_write_all = true;
} }
if (output->data.location == FRAG_RESULT_COLOR || if (output->data.location == FRAG_RESULT_COLOR ||
(output->data.location >= FRAG_RESULT_DATA0 && (output->data.location >= FRAG_RESULT_DATA0 &&
output->data.location <= FRAG_RESULT_DATA7)) { output->data.location <= FRAG_RESULT_DATA7)) {
++m_max_counted_color_exports;
if (m_max_counted_color_exports > 1)
sh_info().fs_write_all = false;
return true; return true;
} }
if (output->data.location == FRAG_RESULT_DEPTH || if (output->data.location == FRAG_RESULT_DEPTH ||
@@ -766,7 +771,6 @@ bool FragmentShaderFromNir::emit_export_pixel(const nir_variable *out_var, nir_i
sh_info().ps_color_export_mask |= mask; sh_info().ps_color_export_mask |= mask;
emit_export_instruction(m_last_pixel_export); emit_export_instruction(m_last_pixel_export);
++m_max_counted_color_exports;
}; };
} else if (out_var->data.location == FRAG_RESULT_DEPTH || } else if (out_var->data.location == FRAG_RESULT_DEPTH ||
out_var->data.location == FRAG_RESULT_STENCIL || out_var->data.location == FRAG_RESULT_STENCIL ||