Capture/Replay: Allow capturing of multisample texture content
It just works.
Bug: angleproject:6611
Change-Id: Ia3da2ee0ea3e09889a65910fd101a7daaa99ea56
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3413157
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Gert Wollny <gert.wollny@collabora.com>
diff --git a/src/libANGLE/capture/frame_capture_utils.cpp b/src/libANGLE/capture/frame_capture_utils.cpp
index ba4a2b7..602ffb6 100644
--- a/src/libANGLE/capture/frame_capture_utils.cpp
+++ b/src/libANGLE/capture/frame_capture_utils.cpp
@@ -1222,7 +1222,9 @@
ASSERT(index.getType() == gl::TextureType::_2D || index.getType() == gl::TextureType::_3D ||
index.getType() == gl::TextureType::_2DArray ||
index.getType() == gl::TextureType::CubeMap ||
- index.getType() == gl::TextureType::CubeMapArray);
+ index.getType() == gl::TextureType::CubeMapArray ||
+ index.getType() == gl::TextureType::_2DMultisampleArray ||
+ index.getType() == gl::TextureType::_2DMultisample);
GLenum glFormat = format.format;
GLenum glType = format.type;
diff --git a/src/tests/capture_replay_tests/capture_replay_expectations.txt b/src/tests/capture_replay_tests/capture_replay_expectations.txt
index 9fed465..fb68020 100644
--- a/src/tests/capture_replay_tests/capture_replay_expectations.txt
+++ b/src/tests/capture_replay_tests/capture_replay_expectations.txt
@@ -179,17 +179,6 @@
# ES3_1 Crashed
6180 : EGLMultiContextTest.ComputeShaderOkayWithRendering/* = CRASH
6180 : EGLMultiContextTest.TestContextDestroySimple/* = CRASH
-6611 : TextureMultisampleArrayWebGLTest.FramebufferColorClearAndBlit/* = CRASH
-6611 : TextureMultisampleArrayWebGLTest.FramebufferCompleteness/* = CRASH
-6611 : TextureMultisampleArrayWebGLTest.IntegerTexelFetch/* = CRASH
-6611 : TextureMultisampleArrayWebGLTest.InvalidFramebufferTextureLayer/* = CRASH
-6611 : TextureMultisampleArrayWebGLTest.SimpleTexelFetch/* = CRASH
-6611 : TextureMultisampleArrayWebGLTest.TexStorage3DMultisample/* = CRASH
-6611 : TextureMultisampleArrayWebGLTest.TextureSizeInShader/* = CRASH
-6611 : TextureMultisampleTest.GetTexLevelParameter/ES3_1* = CRASH
-6611 : TextureMultisampleTest.MultisampleTargetFramebufferTexture2D/ES3_1* = CRASH
-6611 : TextureMultisampleTest.ResolveToDefaultFramebuffer/ES3_1* = CRASH
-6611 : TextureMultisampleTest.ValidateTextureStorageMultisampleParameters/ES3_1* = CRASH
6605 : TextureBufferTestES31.MapTextureBufferInvalidateThenWrite/* = FAIL
6895 : AtomicCounterBufferTest31.AtomicCounterBufferRepeatedBindUnbind/* = CRASH
@@ -215,8 +204,5 @@
6875 : TransformFeedbackTest.SpanMultipleRenderPasses/* = NOT_RUN
# Skip crashing tests after enabling ANGLE_texture_multisample
-3565 : TextureMultisampleTest.ResolveToDefaultFramebuffer/* = CRASH
-3565 : TextureMultisampleTest.GetTexLevelParameter/* = CRASH
-3565 : TextureMultisampleTest.MultisampleTargetFramebufferTexture2D/* = CRASH
-3565 : TextureMultisampleTest.SimpleTexelFetch/* = CRASH
-3565 : TextureMultisampleTest.ValidateTextureStorageMultisampleParameters/* = CRASH
+3565 : TextureMultisampleTest.GetTexLevelParameter/ES3_Vulkan* = COMPILE_FAIL
+
