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

Revert "nir: replace lower_ffma and fuse_ffma with has_ffma"

Browse Source 
This reverts commit 939ddf3f67.

Intel has a separate pass for fusing FFMAs selectively.  We split
these flags in commit 1b72c31e1f and
the reasoning still stands.  The patch being reverted was just a
cleanup, so there should be no issue with reverting it.

Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6849>
This commit is contained in:
Kenneth Graunke
2020-09-24 08:46:31 -07:00
parent d8cdcd4adf
commit 140f53e646
19 changed files with 84 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/drivers/r600/r600_pipe_common.c
View File

@@ -1179,9 +1179,9 @@ struct pipe_resource *r600_resource_create_common(struct pipe_screen *screen,
}
const struct nir_shader_compiler_options r600_nir_fs_options = {
.has_ffma16 = true,
.has_ffma32 = true,
.has_ffma64 = true,
.fuse_ffma16 = true,
.fuse_ffma32 = true,
.fuse_ffma64 = true,
.lower_scmp = true,
.lower_flrp32 = true,
.lower_flrp64 = true,
@@ -1205,9 +1205,9 @@ const struct nir_shader_compiler_options r600_nir_fs_options = {
};
const struct nir_shader_compiler_options r600_nir_options = {
.has_ffma16 = true,
.has_ffma32 = true,
.has_ffma64 = true,
.fuse_ffma16 = true,
.fuse_ffma32 = true,
.fuse_ffma64 = true,
.lower_scmp = true,
.lower_flrp32 = true,
.lower_flrp64 = true,