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

glsl/nir: Fix copying vector constant values

Browse Source 
For n_columns == 1, we have a vector which is handled by the else
case.  Fixes invalid memory access in upcoming ARB_gl_spirv tests.

Failure bisected by Arcady Goldmints-Orlov.

Fixes: 81e51b412e "nir: Make nir_constant a vector rather than a matrix"
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2019-06-21 16:55:08 -07:00
parent 0daeb1d127
commit 390ff8ac54
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/gl_nir_link_uniform_initializers.c
View File

@@ -121,7 +121,7 @@ copy_constant_to_storage(union gl_constant_value *storage,
unsigned dmul = glsl_base_type_is_64bit(base_type) ? 2 : 1; unsigned dmul = glsl_base_type_is_64bit(base_type) ? 2 : 1;
int i = 0; int i = 0;
if (n_columns > 0) { if (n_columns > 1) {
const struct glsl_type *column_type = glsl_get_column_type(type); const struct glsl_type *column_type = glsl_get_column_type(type);
for (unsigned int column = 0; column < n_columns; column++) { for (unsigned int column = 0; column < n_columns; column++) {
copy_constant_to_storage(&storage[i], val->elements[column], copy_constant_to_storage(&storage[i], val->elements[column],