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

nir/find_array_copies: Reject copies with mismatched type

Browse Source 
When we detect a scalar/vector copy through load_deref/store_deref, we
have to be careful since those can bitcast an int to a float and
vice-versa even though copy_deref can't.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111251
Fixes: 156306e5e6 ("nir/find_array_copies: Handle wildcards and overlapping copies")
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Connor Abbott
2019-07-31 11:32:30 +02:00
parent 7368000868
commit f41516bdb5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/nir/nir_opt_find_array_copies.c
View File

@@ -541,13 +541,16 @@ opt_find_array_copies_block(nir_builder *b, nir_block *block,
/* There must be no indirects in the source or destination and no known
* out-of-bounds accesses in the source, and the copy must be fully
* qualified, or else we can't build up the array copy. We handled
* out-of-bounds accesses to the dest above.
* out-of-bounds accesses to the dest above. The types must match, since
* copy_deref currently can't bitcast mismatched deref types.
*/
if (src_deref &&
(nir_deref_instr_has_indirect(src_deref) ||
nir_deref_instr_is_known_out_of_bounds(src_deref) ||
nir_deref_instr_has_indirect(dst_deref) ||
!glsl_type_is_vector_or_scalar(src_deref->type))) {
!glsl_type_is_vector_or_scalar(src_deref->type) ||
glsl_get_bare_type(src_deref->type) !=
glsl_get_bare_type(dst_deref->type))) {
src_deref = NULL;
}