Vulkan: Fix wrong read ptr location when updating uniform block
Fixes these dEQP tests:
dEQP-GLES2.functional.state_query.shader.uniform_value_array
dEQP-GLES2.functional.shaders.indexing.uniform_array.vec2_*
dEQP-GLES2.functional.shaders.indexing.uniform_array.vec3_*
dEQP-GLES2.functional.shaders.struct.uniform.nested_struct_array*
dEQP-GLES2.functional.shaders.struct.uniform.loop_nested_struct_array*
dEQP-GLES2.functional.shaders.struct.uniform.dynamic_loop_nested_struct_array*
dEQP-GLES2.functional.uniform_api.value.assigned.by_value.get_uniform.multiple_nested_structs_arrays.*
dEQP-GLES2.functional.uniform_api.value.assigned.basic_array_assign_partial.multiple_basic_array.*
dEQP-GLES2.functional.uniform_api.value.assigned.basic_array_assign_full.multiple_basic_array.*
dEQP-GLES2.functional.uniform_api.value.assigned.by_value.get_uniform.multiple_basic_array.vertex
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.multiple_basic
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.basic_array_first_elem_without_brackets
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.multiple_basic.vertex
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.multiple_basic.fragment
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.multiple_basic.both
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.multiple_basic_array.*
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.multiple_nested_structs_arrays.*
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.struct_in_array.bool_*
dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.basic_struct.bool_*
dEQP-GLES2.functional.uniform_api.info_query.unused_uniforms.*
dEQP-GLES2.functional.uniform_api.value.initial.get_uniform.multiple_basic.vertex
dEQP-GLES2.functional.uniform_api.value.initial.get_uniform.multiple_basic.fragment
dEQP-GLES2.functional.uniform_api.value.initial.get_uniform.multiple_basic.both
dEQP-GLES2.functional.uniform_api.value.initial.get_uniform.multiple_basic_array.*
dEQP-GLES2.functional.uniform_api.value.initial.get_uniform.multiple_nested_structs_arrays.*
dEQP-GLES2.functional.uniform_api.value.initial.render.basic_struct.*
dEQP-GLES2.functional.uniform_api.value.initial.render.struct_in_array.*
dEQP-GLES2.functional.uniform_api.value.initial.render.array_in_struct.*
dEQP-GLES2.functional.uniform_api.value.initial.render.multiple_basic_array.*
dEQP-GLES2.functional.uniform_api.value.initial.render.multiple_nested_structs_arrays.*
dEQP-GLES2.functional.uniform_api.value.initial.render.nested_structs_arrays.*
dEQP-GLES2.functional.uniform_api.value.assigned.unused_uniforms*
Bug: angleproject:2586
Change-Id: I51f619832424131b7c1eeff9589259b14cf4f358
Reviewed-on: https://chromium-review.googlesource.com/1085369
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Luc Ferron <lucferron@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/ProgramVk.cpp b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
index d0b8660..121b8e5 100644
--- a/src/libANGLE/renderer/vulkan/ProgramVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
@@ -81,7 +81,7 @@
{
const int arrayOffset = writeIndex * layoutInfo.arrayStride;
uint8_t *writePtr = dst + arrayOffset;
- const T *readPtr = v + readIndex;
+ const T *readPtr = v + (readIndex * componentCount);
memcpy(writePtr, readPtr, elementSize);
}
}