FrameCapture: Capture GLES1 vertex buffer pointers.

CaptureVertexPointerGLES1 was expecting only client-side vertex arrays and not checking whether a vertex buffer was bound. This patch fixes offsets in vertex buffers for GLES1, which can be seen in apps like Dr. Driving. The mClientVertexArrayMap index is now retrieved by entrypoint name, as the arrayClientPointerIndex is unset in the vertex buffer case. Bug: angleproject:5751 Change-Id: If40cae56bcdbed57885e83c49291cb000a884b0e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2859826Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>

FrameCapture: Capture GLES1 vertex buffer pointers.
78fb9314 · Lubosz Sarnecki · Commit Bot · d469dcb1 · 78fb9314
Commit 78fb9314 authored Apr 29, 2021 by Lubosz Sarnecki Committed by Commit Bot May 10, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 3 deletions

FrameCapture.cpp src/libANGLE/capture/FrameCapture.cpp +28 -3

No files found.
--- a/src/libANGLE/capture/FrameCapture.cpp
+++ b/src/libANGLE/capture/FrameCapture.cpp
@@ -4068,7 +4068,29 @@ void FrameCapture::maybeCapturePreCallUpdates(const gl::Context *context, CallCa
            }
            else
            {
-                index = call.params.getClientArrayPointerParameter().arrayClientPointerIndex;
+                gl::ClientVertexArrayType type;
+                switch (call.entryPoint)
+                {
+                    case EntryPoint::GLVertexPointer:
+                        type = gl::ClientVertexArrayType::Vertex;
+                        break;
+                    case EntryPoint::GLColorPointer:
+                        type = gl::ClientVertexArrayType::Color;
+                        break;
+                    case EntryPoint::GLTexCoordPointer:
+                        type = gl::ClientVertexArrayType::TextureCoord;
+                        break;
+                    case EntryPoint::GLNormalPointer:
+                        type = gl::ClientVertexArrayType::Normal;
+                        break;
+                    case EntryPoint::GLPointSizePointerOES:
+                        type = gl::ClientVertexArrayType::PointSize;
+                        break;
+                    default:
+                        UNREACHABLE();
+                        type = gl::ClientVertexArrayType::InvalidEnum;
+                }
+                index = gl::GLES1Renderer::VertexArrayIndex(type, context->getState().gles1());
            }
            if (call.params.hasClientArrayData())
@@ -5062,8 +5084,11 @@ void CaptureVertexPointerGLES1(const gl::State &glState,
                               ParamCapture *paramCapture)
 {
    paramCapture->value.voidConstPointerVal = pointer;
-    paramCapture->arrayClientPointerIndex =
+    if (!glState.getTargetBuffer(gl::BufferBinding::Array))
-        gl::GLES1Renderer::VertexArrayIndex(type, glState.gles1());
+    {
+        paramCapture->arrayClientPointerIndex =
+            gl::GLES1Renderer::VertexArrayIndex(type, glState.gles1());
+    }
 }
 gl::Program *GetProgramForCapture(const gl::State &glState, gl::ShaderProgramID handle)