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

nir: Make nir_deref_instr_build/get_const_offset actually use size_align.

Browse Source 
I think this was copy-and-paste mistake -- nir_opt_large_constants was
passing in glsl_get_natural_size_align_bytes() given brw_nir.c's arguments
to the opt pass.

I wanted to reuse this function for handling constant offsets of arrays of
images in V3D.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Eric Anholt
2019-01-04 16:52:32 -08:00
parent 9f29d90327
commit 211b826790
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/nir/nir_deref.c
View File

@@ -143,7 +143,7 @@ type_get_array_stride(const struct glsl_type *elem_type,
glsl_type_size_align_func size_align)
{
unsigned elem_size, elem_align;
glsl_get_natural_size_align_bytes(elem_type, &elem_size, &elem_align);
size_align(elem_type, &elem_size, &elem_align);
return ALIGN_POT(elem_size, elem_align);
}
@@ -156,8 +156,7 @@ struct_type_get_field_offset(const struct glsl_type *struct_type,
unsigned offset = 0;
for (unsigned i = 0; i <= field_idx; i++) {
unsigned elem_size, elem_align;
glsl_get_natural_size_align_bytes(glsl_get_struct_field(struct_type, i),
&elem_size, &elem_align);
size_align(glsl_get_struct_field(struct_type, i), &elem_size, &elem_align);
offset = ALIGN_POT(offset, elem_align);
if (i < field_idx)
offset += elem_size;