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

glsl/nir: Fix copying 64-bit values in uniform storage

Browse Source 
The iterator `i` already walks the right amount now that is
incremented by `dmul`, so no need to `* 2`.  Fixes invalid memory
access in upcoming ARB_gl_spirv tests.

Failure bisected by Arcady Goldmints-Orlov.

Fixes: b019fe8a5b "glsl/nir: Fix handling of 64-bit values in uniform storage"
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2019-06-21 17:11:54 -07:00
parent 390ff8ac54
commit 6e2ff10886
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

@@ -145,7 +145,7 @@ copy_constant_to_storage(union gl_constant_value *storage,
case GLSL_TYPE_UINT64: case GLSL_TYPE_UINT64:
case GLSL_TYPE_INT64: case GLSL_TYPE_INT64:
/* XXX need to check on big-endian */ /* XXX need to check on big-endian */
memcpy(&storage[i * 2].u, &val->values[row].f64, sizeof(double)); memcpy(&storage[i].u, &val->values[row].f64, sizeof(double));
break; break;
case GLSL_TYPE_BOOL: case GLSL_TYPE_BOOL:
storage[i].b = val->values[row].u32 ? boolean_true : 0; storage[i].b = val->values[row].u32 ? boolean_true : 0;