Commit c1da2794 by Gert Wollny Committed by Commit Bot

Capture/Replay: Handle ClientArraysEnabled in trace meta data

Bug: angleproject:5848 Change-Id: Ieba325e2b5efa3242b24cafa8363e562c258546c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2835888 Commit-Queue: Gert Wollny <gert.wollny@collabora.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent fa269790
...@@ -1188,6 +1188,9 @@ void WriteCppReplayIndexFiles(bool compression, ...@@ -1188,6 +1188,9 @@ void WriteCppReplayIndexFiles(bool compression,
<< (config ? std::to_string(config->stencilSize) : "EGL_DONT_CARE") << ";\n"; << (config ? std::to_string(config->stencilSize) : "EGL_DONT_CARE") << ";\n";
header << "constexpr bool kIsBinaryDataCompressed = " << (compression ? "true" : "false") header << "constexpr bool kIsBinaryDataCompressed = " << (compression ? "true" : "false")
<< ";\n"; << ";\n";
header << "constexpr bool kAreClientArraysEnabled = "
<< (context->getState().areClientArraysEnabled() ? "true" : "false") << ";\n";
header << "// End Trace Metadata\n"; header << "// End Trace Metadata\n";
header << "\n"; header << "\n";
for (uint32_t frameIndex = 1; frameIndex <= frameCount; ++frameIndex) for (uint32_t frameIndex = 1; frameIndex <= frameCount; ++frameIndex)
......
...@@ -95,7 +95,8 @@ test_trace_info_init_template = """\ ...@@ -95,7 +95,8 @@ test_trace_info_init_template = """\
{namespace}::kDefaultFramebufferAlphaBits, {namespace}::kDefaultFramebufferAlphaBits,
{namespace}::kDefaultFramebufferDepthBits, {namespace}::kDefaultFramebufferDepthBits,
{namespace}::kDefaultFramebufferStencilBits, {namespace}::kDefaultFramebufferStencilBits,
{namespace}::kIsBinaryDataCompressed {namespace}::kIsBinaryDataCompressed,
{namespace}::kAreClientArraysEnabled,
}}, }},
""" """
...@@ -123,6 +124,7 @@ struct TestTraceInfo {{ ...@@ -123,6 +124,7 @@ struct TestTraceInfo {{
EGLint defaultFramebufferDepthBits; EGLint defaultFramebufferDepthBits;
EGLint defaultFramebufferStencilBits; EGLint defaultFramebufferStencilBits;
bool isBinaryDataCompressed; bool isBinaryDataCompressed;
bool areClientArraysEnabled;
}}; }};
extern std::vector<TestTraceInfo> testTraceInfos; extern std::vector<TestTraceInfo> testTraceInfos;
......
...@@ -76,6 +76,8 @@ class CaptureReplayTests ...@@ -76,6 +76,8 @@ class CaptureReplayTests
configParams.depthBits = testTraceInfo.defaultFramebufferDepthBits; configParams.depthBits = testTraceInfo.defaultFramebufferDepthBits;
configParams.stencilBits = testTraceInfo.defaultFramebufferStencilBits; configParams.stencilBits = testTraceInfo.defaultFramebufferStencilBits;
configParams.clientArraysEnabled = testTraceInfo.areClientArraysEnabled;
mPlatformParams.renderer = testTraceInfo.replayPlatformType; mPlatformParams.renderer = testTraceInfo.replayPlatformType;
mPlatformParams.deviceType = testTraceInfo.replayDeviceType; mPlatformParams.deviceType = testTraceInfo.replayDeviceType;
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
# Failed tests # Failed tests
BindGeneratesResourceTest.* BindGeneratesResourceTest.*
ClientArraysTest.*
CopyTextureTestWebGL.NPOT/* CopyTextureTestWebGL.NPOT/*
D3DImageFormatConversionTest.* D3DImageFormatConversionTest.*
DifferentStencilMasksTest.* DifferentStencilMasksTest.*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment