VertexArrayGL: fix the streaming of offset non-packed strides

When the packed stride and source stride were different, the streaming code path used a loop that added two times the offset for the start of the index range. BUG=angleproject:1135 Change-Id: I6d314a1a28abec4df22f7c798c1af87a18d8b7ec Reviewed-on: https://chromium-review.googlesource.com/295225Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

VertexArrayGL: fix the streaming of offset non-packed strides
4d5362d0 · Corentin Wallez · 80a6fc03 · 4d5362d0 · 4d5362d0
Commit 4d5362d0 authored Aug 25, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

VertexArrayGL.cpp src/libANGLE/renderer/gl/VertexArrayGL.cpp +5 -3

deqp_gles2_test_expectations.txt src/tests/deqp_support/deqp_gles2_test_expectations.txt +0 -2

No files found.
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -308,10 +308,12 @@ gl::Error VertexArrayGL::streamAttributes(const gl::AttributesMask &activeAttrib
            else
            {
                // Copy each vertex individually
-                for (size_t vertexIdx = indexRange.start; vertexIdx <= indexRange.end; vertexIdx++)
+                for (size_t vertexIdx = 0; vertexIdx <= streamedVertexCount; vertexIdx++)
                {
-                    memcpy(bufferPointer + curBufferOffset + (destStride * vertexIdx),
+                    uint8_t *out = bufferPointer + curBufferOffset + (destStride * vertexIdx);
-                           inputPointer + (sourceStride * vertexIdx), destStride);
+                    const uint8_t *in =
+                        inputPointer + sourceStride * (vertexIdx + indexRange.start);
+                    memcpy(out, in, destStride);
                }
            }

--- a/src/tests/deqp_support/deqp_gles2_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
@@ -149,8 +149,6 @@
 1051 LINUX : dEQP-GLES2.functional.clipping.point.wide_point_z_clip_viewport_center = FAIL
 1051 LINUX : dEQP-GLES2.functional.clipping.point.wide_point_z_clip_viewport_corner = FAIL
 1051 LINUX : dEQP-GLES2.functional.debug_marker.invalid = FAIL
-1051 LINUX : dEQP-GLES2.functional.draw.random.1 = FAIL
-1051 LINUX : dEQP-GLES2.functional.draw.random.12 = FAIL
 1051 LINUX : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.none_none_none_rbo = FAIL
 1051 LINUX : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.none_none_rbo_rbo = FAIL
 1051 LINUX : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.rbo_none_none_rbo = FAIL