Fix bugs in angle_end2end_tests and frame capture

1. CaptureGetShaderInfoLog_infoLog method should not require shader object to be compiled 2. glCompressedTexImage3D's parameter locations are off by 1 3. EGLContextSharingTest.DisplayShareGroupObjectSharing test should not delete buffers it has no access to since it will crash when running capture replay Bug: angleproject:4801 Change-Id: I0d407cdb44eb41eea4209eebab0996d3dd8ae5f5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2272862 Commit-Queue: Manh Nguyen <nguyenmh@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com>

Fix bugs in angle_end2end_tests and frame capture
3688cb36 · Manh Nguyen · Commit Bot · 9b8ee0ff · 3688cb36 · 3688cb36
Commit 3688cb36 authored Jun 28, 2020 by Manh Nguyen Committed by Commit Bot Jul 07, 2020
Showing with 5 additions and 6 deletions

FrameCapture.cpp src/libANGLE/FrameCapture.cpp +4 -4

capture_gles_2_0_params.cpp src/libANGLE/capture_gles_2_0_params.cpp +1 -1

EGLContextSharingTest.cpp src/tests/egl_tests/EGLContextSharingTest.cpp +0 -1

No files found.
--- a/src/libANGLE/FrameCapture.cpp
+++ b/src/libANGLE/FrameCapture.cpp
@@ -3285,10 +3285,10 @@ void FrameCapture::captureCompressedTextureData(const gl::Context *context, cons
            dataParamOffset    = 10;
            break;
        case gl::EntryPoint::CompressedTexImage3D:
-            widthParamOffset  = 4;
-            heightParamOffset = 5;
-            depthParamOffset  = 6;
-            dataParamOffset   = 9;
+            widthParamOffset  = 3;
+            heightParamOffset = 4;
+            depthParamOffset  = 5;
+            dataParamOffset   = 8;
            break;
        case gl::EntryPoint::CompressedTexSubImage2D:
            xoffsetParamOffset = 2;

--- a/src/libANGLE/capture_gles_2_0_params.cpp
+++ b/src/libANGLE/capture_gles_2_0_params.cpp
@@ -446,7 +446,7 @@ void CaptureGetShaderInfoLog_infoLog(const State &glState,
                                     ParamCapture *paramCapture)
 {
    gl::Shader *shaderObj = glState.getShaderProgramManagerForCapture().getShader(shader);
-    ASSERT(shaderObj && shaderObj->isCompiled());
+    ASSERT(shaderObj);
    paramCapture->readBufferSizeBytes = shaderObj->getInfoLogLength() + 1;
 }


--- a/src/tests/egl_tests/EGLContextSharingTest.cpp
+++ b/src/tests/egl_tests/EGLContextSharingTest.cpp
@@ -175,7 +175,6 @@ TEST_P(EGLContextSharingTest, DisplayShareGroupObjectSharing)
    ASSERT_GL_TRUE(glIsTexture(textureFromCtx0));

    ASSERT_GL_FALSE(glIsBuffer(bufferFromCtx0));
-    glDeleteBuffers(1, &bufferFromCtx0);
    ASSERT_GL_NO_ERROR();

    // Call readpixels on the texture to verify that the backend has proper support