Skip to content

A
angle
Commit e5c18475 by Manh Nguyen Committed by Commit Bot
Options

Multi-frames serialization + comparision for capture replay test

Changes how context states are serialized during capture run. Now, context states are serialized after each frame until the end frame is reached, or context is destroyed. Adds an api to the trace files to query serialization results of multiple frames. Makes change to CaptureReplayTest to serialize multiple frames then compares the serialization results with the ones retrieved from said api. Adds to capture replay the ability to produce working, compilable trace files even when end frame is not reached. Adds to the generated trace files config information and makes CaptureReplayTest utilize said config information to reproduce the exact environment of the captured application. Bug: angleproject:4817 Change-Id: Ie3d487af2bacf349dc3ff6f6b1b5f89e1169dc84 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2282885 Commit-Queue: Manh Nguyen <nguyenmh@google.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 92ffd40e
Showing with 217 additions and 88 deletions
src/libANGLE/Context.cpp
......@@ -531,7 +531,7 @@ void Context::initialize()
egl::Error Context::onDestroy(const egl::Display *display)
{
// Dump frame capture if enabled.
mFrameCapture->onEndFrame(this);
mFrameCapture->onDestroyContext(this);
if (mGLES1Renderer)
{
......
src/libANGLE/FrameCapture.cpp
......@@ -18,6 +18,7 @@
#include "common/mathutil.h"
#include "common/system_utils.h"
#include "libANGLE/Config.h"
#include "libANGLE/Context.h"
#include "libANGLE/Fence.h"
#include "libANGLE/Framebuffer.h"
......@@ -214,6 +215,22 @@ std::ostream &operator<<(std::ostream &os, const FmtReplayFunction &fmt)
return os;
}
struct FmtGetSerializedContextStateDataFunction
{
FmtGetSerializedContextStateDataFunction(gl::ContextID contextIdIn, uint32_t frameIndexIn)
: contextId(contextIdIn), frameIndex(frameIndexIn)
{}
gl::ContextID contextId;
uint32_t frameIndex;
};
std::ostream &operator<<(std::ostream &os, const FmtGetSerializedContextStateDataFunction &fmt)
{
os << "GetSerializedContext" << static_cast<int>(fmt.contextId) << "StateFrame"
<< fmt.frameIndex << "Data()";
return os;
}
std::string GetCaptureFileName(gl::ContextID contextId,
const std::string &captureLabel,
uint32_t frameIndex,
......@@ -806,21 +823,23 @@ void MaybeResetResources(std::stringstream &out,
void WriteCppReplay(bool compression,
const std::string &outDir,
gl::ContextID contextId,
const gl::Context *context,
const std::string &captureLabel,
uint32_t frameIndex,
uint32_t frameStart,
uint32_t frameEnd,
const std::vector<CallCapture> &frameCalls,
const std::vector<CallCapture> &setupCalls,
ResourceTracker *resourceTracker,
std::vector<uint8_t> *binaryData)
std::vector<uint8_t> *binaryData,
bool serializeStateEnabled)
{
DataCounters counters;
std::stringstream out;
std::stringstream header;
header << "#include \"" << FmtCapturePrefix(contextId, captureLabel) << ".h\"\n";
header << "#include \"" << FmtCapturePrefix(context->id(), captureLabel) << ".h\"\n";
header << "";
header << "\n";
header << "namespace\n";
......@@ -832,14 +851,14 @@ void WriteCppReplay(bool compression,
out << "{\n";
}
if (frameIndex == 0 || !setupCalls.empty())
if (frameIndex == frameStart)
{
out << "void SetupContext" << Str(static_cast<int>(contextId)) << "Replay()\n";
out << "void SetupContext" << Str(static_cast<int>(context->id())) << "Replay()\n";
out << "{\n";
std::stringstream setupCallStream;
WriteLoadBinaryDataCall(compression, setupCallStream, contextId, captureLabel);
WriteLoadBinaryDataCall(compression, setupCallStream, context->id(), captureLabel);
for (const CallCapture &call : setupCalls)
{
......@@ -857,7 +876,7 @@ void WriteCppReplay(bool compression,
if (frameIndex == frameEnd)
{
// Emit code to reset back to starting state
out << "void ResetContext" << Str(static_cast<int>(contextId)) << "Replay()\n";
out << "void ResetContext" << Str(static_cast<int>(context->id())) << "Replay()\n";
out << "{\n";
std::stringstream restoreCallStream;
......@@ -876,7 +895,7 @@ void WriteCppReplay(bool compression,
out << "\n";
}
out << "void " << FmtReplayFunction(contextId, frameIndex) << "\n";
out << "void " << FmtReplayFunction(context->id(), frameIndex) << "\n";
out << "{\n";
std::stringstream callStream;
......@@ -891,6 +910,30 @@ void WriteCppReplay(bool compression,
out << callStream.str();
out << "}\n";
if (serializeStateEnabled)
{
gl::BinaryOutputStream serializedContextData{};
if (SerializeContext(&serializedContextData, const_cast<gl::Context *>(context)) ==
Result::Continue)
{
size_t serializedContextLength = serializedContextData.length();
size_t serializedContextOffset = rx::roundUp(binaryData->size(), kBinaryAlignment);
binaryData->resize(serializedContextOffset + serializedContextLength);
memcpy(binaryData->data() + serializedContextOffset, serializedContextData.data(),
serializedContextLength);
out << "std::vector<uint8_t> "
<< FmtGetSerializedContextStateDataFunction(context->id(), frameIndex) << "\n";
out << "{\n";
out << " std::vector<uint8_t> serializedContextData(" << serializedContextLength
<< ");\n";
out << " memcpy(serializedContextData.data(), &gBinaryData["
<< serializedContextOffset << "], " << serializedContextLength << ");\n";
out << " return serializedContextData;\n";
out << "}\n";
out << "\n";
}
}
if (!captureLabel.empty())
{
out << "} // namespace " << captureLabel << "\n";
......@@ -903,7 +946,7 @@ void WriteCppReplay(bool compression,
std::string headerString = header.str();
std::string cppFilePath =
GetCaptureFilePath(outDir, contextId, captureLabel, frameIndex, ".cpp");
GetCaptureFilePath(outDir, context->id(), captureLabel, frameIndex, ".cpp");
SaveFileHelper saveCpp(cppFilePath);
saveCpp << headerString << "\n" << outString;
......@@ -912,7 +955,7 @@ void WriteCppReplay(bool compression,
void WriteCppReplayIndexFiles(bool compression,
const std::string &outDir,
const gl::Context *context,
const gl::ContextID contextId,
const std::string &captureLabel,
uint32_t frameStart,
uint32_t frameEnd,
......@@ -922,25 +965,11 @@ void WriteCppReplayIndexFiles(bool compression,
const gl::AttribArray<size_t> &clientArraySizes,
const HasResourceTypeMap &hasResourceType,
bool serializeStateEnabled,
bool writeResetContextCall,
const egl::Config *config,
std::vector<uint8_t> &binaryData)
{
gl::ContextID contextId = context->id();
size_t serializedContextLength = 0;
size_t serializedContextOffset = 0;
if (serializeStateEnabled)
{
gl::BinaryOutputStream serializedContextData{};
if (SerializeContext(&serializedContextData, context) != Result::Continue)
{
return;
}
// store serialized context behind capture replay data
serializedContextLength = serializedContextData.length();
serializedContextOffset = rx::roundUp(binaryData.size(), kBinaryAlignment);
binaryData.resize(serializedContextOffset + serializedContextLength);
memcpy(binaryData.data() + serializedContextOffset, serializedContextData.data(),
serializedContextLength);
}
size_t maxClientArraySize = MaxClientArraySize(clientArraySizes);
std::stringstream header;
......@@ -982,6 +1011,12 @@ void WriteCppReplayIndexFiles(bool compression,
header << "constexpr uint32_t kReplayFrameEnd = " << frameEnd << ";\n";
header << "constexpr EGLint kReplayDrawSurfaceWidth = " << drawSurfaceWidth << ";\n";
header << "constexpr EGLint kReplayDrawSurfaceHeight = " << drawSurfaceHeight << ";\n";
header << "constexpr EGLint kDefaultFramebufferRedBits = " << config->redSize << ";\n";
header << "constexpr EGLint kDefaultFramebufferGreenBits = " << config->greenSize << ";\n";
header << "constexpr EGLint kDefaultFramebufferBlueBits = " << config->blueSize << ";\n";
header << "constexpr EGLint kDefaultFramebufferAlphaBits = " << config->alphaSize << ";\n";
header << "constexpr EGLint kDefaultFramebufferDepthBits = " << config->depthSize << ";\n";
header << "constexpr EGLint kDefaultFramebufferStencilBits = " << config->stencilSize << ";\n";
header << "\n";
header << "void SetupContext" << static_cast<int>(contextId) << "Replay();\n";
header << "void ReplayContext" << static_cast<int>(contextId)
......@@ -989,8 +1024,8 @@ void WriteCppReplayIndexFiles(bool compression,
header << "void ResetContext" << static_cast<int>(contextId) << "Replay();\n";
if (serializeStateEnabled)
{
header << "std::vector<uint8_t> GetSerializedContextState" << static_cast<int>(contextId)
<< "Data();\n";
header << "std::vector<uint8_t> GetSerializedContext" << static_cast<int>(contextId)
<< "StateData(uint32_t frameIndex);\n";
}
header << "\n";
header << "using FramebufferChangeCallback = void(*)(void *userData, GLenum target, GLuint "
......@@ -1004,6 +1039,16 @@ void WriteCppReplayIndexFiles(bool compression,
header << "void " << FmtReplayFunction(contextId, frameIndex) << ";\n";
}
header << "\n";
if (serializeStateEnabled)
{
for (uint32_t frameIndex = frameStart; frameIndex <= frameEnd; ++frameIndex)
{
header << "std::vector<uint8_t> "
<< FmtGetSerializedContextStateDataFunction(contextId, frameIndex) << ";\n";
}
}
header << "\n";
header << "constexpr bool kIsBinaryDataCompressed = " << (compression ? "true" : "false")
<< ";\n";
header << "\n";
......@@ -1124,16 +1169,32 @@ void WriteCppReplayIndexFiles(bool compression,
source << "}\n";
source << "\n";
if (writeResetContextCall)
{
source << "void ResetContext" << Str(static_cast<int>(contextId)) << "Replay()\n";
source << "{\n";
source << " // Reset context is empty because context is destroyed before end "
"frame is reached\n";
source << "}\n";
source << "\n";
}
if (serializeStateEnabled)
{
source << "std::vector<uint8_t> GetSerializedContextState" << static_cast<int>(contextId)
<< "Data()\n";
source << "std::vector<uint8_t> GetSerializedContext" << static_cast<int>(contextId)
<< "StateData(uint32_t frameIndex)\n";
source << "{\n";
source << " std::vector<uint8_t> serializedContextData(" << serializedContextLength
<< ");\n";
source << " memcpy(serializedContextData.data(), &gBinaryData["
<< serializedContextOffset << "], " << serializedContextLength << ");\n";
source << " return serializedContextData;\n";
source << " switch (frameIndex)\n";
source << " {\n";
for (uint32_t frameIndex = frameStart; frameIndex <= frameEnd; ++frameIndex)
{
source << " case " << frameIndex << ":\n";
source << " return "
<< FmtGetSerializedContextStateDataFunction(contextId, frameIndex) << ";\n";
}
source << " default:\n";
source << " return {};\n";
source << " }\n";
source << "}\n";
source << "\n";
}
......@@ -2676,7 +2737,11 @@ void CaptureMidExecutionSetup(const gl::Context *context,
// Bind the current XFB buffer after populating XFB objects
gl::TransformFeedback *currentXFB = apiState.getCurrentTransformFeedback();
cap(CaptureBindTransformFeedback(replayState, true, GL_TRANSFORM_FEEDBACK, currentXFB->id()));
if (currentXFB)
{
cap(CaptureBindTransformFeedback(replayState, true, GL_TRANSFORM_FEEDBACK,
currentXFB->id()));
}
// Capture Sampler Objects
const gl::SamplerManager &samplers = apiState.getSamplerManagerForCapture();
......@@ -3902,22 +3967,28 @@ void FrameCapture::onEndFrame(const gl::Context *context)
// Note that we currently capture before the start frame to collect shader and program sources.
if (!mFrameCalls.empty() && mFrameIndex >= mFrameStart)
{
WriteCppReplay(mCompression, mOutDirectory, context->id(), mCaptureLabel, mFrameIndex,
mFrameEnd, mFrameCalls, mSetupCalls, &mResourceTracker, &mBinaryData);
// Save the index files after the last frame.
if (mIsFirstFrame)
{
mFrameStart = mFrameIndex;
mIsFirstFrame = false;
}
WriteCppReplay(mCompression, mOutDirectory, context, mCaptureLabel, mFrameIndex,
mFrameStart, mFrameEnd, mFrameCalls, mSetupCalls, &mResourceTracker,
&mBinaryData, mSerializeStateEnabled);
if (mFrameIndex == mFrameEnd)
{
WriteCppReplayIndexFiles(mCompression, mOutDirectory, context, mCaptureLabel,
mFrameStart, mFrameEnd, mDrawSurfaceWidth, mDrawSurfaceHeight,
mReadBufferSize, mClientArraySizes, mHasResourceType,
mSerializeStateEnabled, mBinaryData);
// Save the index files after the last frame.
WriteCppReplayIndexFiles(
mCompression, mOutDirectory, context->id(), mCaptureLabel, mFrameStart, mFrameEnd,
mDrawSurfaceWidth, mDrawSurfaceHeight, mReadBufferSize, mClientArraySizes,
mHasResourceType, mSerializeStateEnabled, false, context->getConfig(), mBinaryData);
if (!mBinaryData.empty())
{
SaveBinaryData(mCompression, mOutDirectory, context->id(), mCaptureLabel,
mBinaryData);
mBinaryData.clear();
}
mWroteIndexFile = true;
}
}
......@@ -3946,6 +4017,32 @@ void FrameCapture::onEndFrame(const gl::Context *context)
}
}
void FrameCapture::onDestroyContext(const gl::Context *context)
{
if (!mEnabled)
{
return;
}
if (!mWroteIndexFile && mFrameIndex > mFrameStart)
{
// If context is destroyed before end frame is reached and at least
// 1 frame has been recorded, then write the index files.
// It doesnt make sense to write the index files when no frame has been recorded
mFrameIndex -= 1;
mFrameEnd = mFrameIndex;
WriteCppReplayIndexFiles(mCompression, mOutDirectory, context->id(), mCaptureLabel,
mFrameStart, mFrameEnd, mDrawSurfaceWidth, mDrawSurfaceHeight,
mReadBufferSize, mClientArraySizes, mHasResourceType,
mSerializeStateEnabled, true, context->getConfig(), mBinaryData);
if (!mBinaryData.empty())
{
SaveBinaryData(mCompression, mOutDirectory, context->id(), mCaptureLabel, mBinaryData);
mBinaryData.clear();
}
mWroteIndexFile = true;
}
}
void FrameCapture::onMakeCurrent(const egl::Surface *drawSurface)
{
if (!drawSurface)
......
src/libANGLE/FrameCapture.h
......@@ -273,6 +273,7 @@ class FrameCapture final : angle::NonCopyable
void captureCall(const gl::Context *context, CallCapture &&call);
void onEndFrame(const gl::Context *context);
void onDestroyContext(const gl::Context *context);
void onMakeCurrent(const egl::Surface *drawSurface);
bool enabled() const { return mEnabled; }
......@@ -319,6 +320,8 @@ class FrameCapture final : angle::NonCopyable
uint32_t mFrameIndex;
uint32_t mFrameStart;
uint32_t mFrameEnd;
bool mIsFirstFrame = true;
bool mWroteIndexFile = false;
EGLint mDrawSurfaceWidth = 0;
EGLint mDrawSurfaceHeight = 0;
gl::AttribArray<size_t> mClientArraySizes;
......
src/libANGLE/FrameCapture_mock.cpp
......@@ -25,5 +25,6 @@ FrameCapture::FrameCapture() {}
FrameCapture::~FrameCapture() {}
void FrameCapture::onEndFrame(const gl::Context *context) {}
void FrameCapture::onMakeCurrent(const egl::Surface *drawSurface) {}
void FrameCapture::onDestroyContext(const gl::Context *context) {}
void FrameCapture::replay(gl::Context *context) {}
} // namespace angle
src/tests/capture_replay_tests.py
......@@ -160,20 +160,22 @@ def ClearFolderContent(path):
def CanRunReplay(path):
required_trace_files = {
"angle_capture_context1.h", "angle_capture_context1.cpp",
"angle_capture_context1_files.txt", "angle_capture_context1_frame000.cpp"
"angle_capture_context1_files.txt"
}
binary_data_file = "angle_capture_context1.angledata.gz"
required_trace_files_count = 0
frame_files_count = 0
for f in os.listdir(path):
if not os.path.isfile(os.path.join(path, f)):
continue
if f in required_trace_files:
required_trace_files_count += 1
elif os.path.isfile(os.path.join(path, f)) and f != binary_data_file and \
f.startswith("angle_capture_context"):
elif f.startswith("angle_capture_context1_frame"):
frame_files_count += 1
elif f.startswith("angle_capture_context") and not f.startswith("angle_capture_context1"):
# if trace_files of another context exists, then the test creates multiple contexts
# or capture multiple frames
return False
# angle_capture_context1.angledata.gz can be missing
return required_trace_files_count == len(required_trace_files)
return required_trace_files_count == len(required_trace_files) and frame_files_count >= 1
def SetCWDToAngleFolder():
......@@ -190,7 +192,7 @@ def main(build_dir, verbose, use_goma, gtest_filter, test_exec):
capture_out_dir = "src/tests/capture_replay_tests/traces" # relative to ANGLE folder
if not os.path.isdir(capture_out_dir):
os.mkdir(capture_out_dir)
environment_vars = [("ANGLE_CAPTURE_FRAME_END", "0"),
environment_vars = [("ANGLE_CAPTURE_FRAME_END", "100"),
("ANGLE_CAPTURE_OUT_DIR", capture_out_dir),
("ANGLE_CAPTURE_SERIALIZE_STATE", "1")]
replay_exec = "capture_replay_tests"
......@@ -248,7 +250,8 @@ def main(build_dir, verbose, use_goma, gtest_filter, test_exec):
if os.path.isdir(capture_out_dir):
shutil.rmtree(capture_out_dir)
print("\n\n\n")
print("Passed:", passed_count, "Failed:", failed_count, "Skipped:", skipped_count)
print("Passed: "+ str(passed_count) + " Failed: " + str(failed_count) + \
" Skipped: " + str(skipped_count))
print("Failed tests:")
for failed_test in failed_tests:
print("\t" + failed_test)
......
src/tests/capture_replay_tests/CaptureReplayTest.cpp
......@@ -38,16 +38,16 @@ std::function<void(int)> ReplayContextFrame = reinterpret_cast<void (*)(int)>(
std::function<void()> ResetContextReplay = reinterpret_cast<void (*)()>(
ANGLE_MACRO_CONCAT(ResetContext,
ANGLE_MACRO_CONCAT(ANGLE_CAPTURE_REPLAY_TEST_CONTEXT_ID, Replay)));
std::function<std::vector<uint8_t>()> GetSerializedContextStateData =
reinterpret_cast<std::vector<uint8_t> (*)()>(
ANGLE_MACRO_CONCAT(GetSerializedContextState,
ANGLE_MACRO_CONCAT(ANGLE_CAPTURE_REPLAY_TEST_CONTEXT_ID, Data)));
std::function<std::vector<uint8_t>(uint32_t)> GetSerializedContextStateData =
reinterpret_cast<std::vector<uint8_t> (*)(uint32_t)>(
ANGLE_MACRO_CONCAT(GetSerializedContext,
ANGLE_MACRO_CONCAT(ANGLE_CAPTURE_REPLAY_TEST_CONTEXT_ID, StateData)));
class CaptureReplayTest
{
public:
CaptureReplayTest(int width, int height, EGLint glesMajorVersion, EGLint glesMinorVersion)
: mWidth(width), mHeight(height), mOSWindow(nullptr), mEGLWindow(nullptr)
CaptureReplayTest(EGLint glesMajorVersion, EGLint glesMinorVersion)
: mOSWindow(nullptr), mEGLWindow(nullptr)
{
mPlatformParams.renderer = EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE;
......@@ -59,6 +59,7 @@ class CaptureReplayTest
mEGLWindow = EGLWindow::New(glesMajorVersion, glesMinorVersion);
mOSWindow = OSWindow::New();
mOSWindow->disableErrorMessageDialog();
}
~CaptureReplayTest()
......@@ -83,13 +84,12 @@ class CaptureReplayTest
return true;
}
void draw() { ReplayContextFrame(0); }
void swap() { mEGLWindow->swap(); }
int run()
{
if (!mOSWindow->initialize("Capture Replay Test", mWidth, mHeight))
if (!mOSWindow->initialize("Capture Replay Test", kReplayDrawSurfaceWidth,
kReplayDrawSurfaceHeight))
{
return -1;
}
......@@ -97,12 +97,12 @@ class CaptureReplayTest
mOSWindow->setVisible(true);
ConfigParameters configParams;
configParams.redBits = 8;
configParams.greenBits = 8;
configParams.blueBits = 8;
configParams.alphaBits = 8;
configParams.depthBits = 24;
configParams.stencilBits = 8;
configParams.redBits = kDefaultFramebufferRedBits;
configParams.greenBits = kDefaultFramebufferGreenBits;
configParams.blueBits = kDefaultFramebufferBlueBits;
configParams.alphaBits = kDefaultFramebufferAlphaBits;
configParams.depthBits = kDefaultFramebufferDepthBits;
configParams.stencilBits = kDefaultFramebufferStencilBits;
if (!mEGLWindow->initializeGL(mOSWindow, mEntryPointsLib.get(),
angle::GLESDriverType::AngleEGL, mPlatformParams,
......@@ -124,20 +124,23 @@ class CaptureReplayTest
result = -1;
}
draw();
gl::Context *context = static_cast<gl::Context *>(mEGLWindow->getContext());
gl::BinaryOutputStream bos;
if (angle::SerializeContext(&bos, context) != angle::Result::Continue)
{
return -1;
}
bool isEqual = compareSerializedStates(bos);
if (!isEqual)
for (uint32_t frame = kReplayFrameStart; frame <= kReplayFrameEnd; frame++)
{
result = -1;
ReplayContextFrame(frame);
gl::Context *context = static_cast<gl::Context *>(mEGLWindow->getContext());
gl::BinaryOutputStream bos;
// If swapBuffers is not called, then default framebuffer should not be serialized
if (angle::SerializeContext(&bos, context) != angle::Result::Continue)
{
return -1;
}
bool isEqual = compareSerializedStates(frame, bos);
if (!isEqual)
{
return -1;
}
swap();
}
swap();
mEGLWindow->destroyGL();
mOSWindow->destroy();
......@@ -146,13 +149,12 @@ class CaptureReplayTest
}
private:
bool compareSerializedStates(const gl::BinaryOutputStream &replaySerializedContextData)
bool compareSerializedStates(uint32_t frame,
const gl::BinaryOutputStream &replaySerializedContextData)
{
return GetSerializedContextStateData() == replaySerializedContextData.getData();
return GetSerializedContextStateData(frame) == replaySerializedContextData.getData();
}
uint32_t mWidth;
uint32_t mHeight;
OSWindow *mOSWindow;
EGLWindow *mEGLWindow;
......@@ -165,10 +167,8 @@ class CaptureReplayTest
int main(int argc, char **argv)
{
// TODO (nguyenmh): http://anglebug.com/4759: initialize app with arguments taken from cmdline
const int width = 128;
const int height = 128;
const EGLint glesMajorVersion = 2;
const GLint glesMinorVersion = 0;
CaptureReplayTest app(width, height, glesMajorVersion, glesMinorVersion);
CaptureReplayTest app(glesMajorVersion, glesMinorVersion);
return app.run();
}
src/tests/test_utils/ANGLETest.cpp
......@@ -436,6 +436,7 @@ void ANGLETestBase::initOSWindow()
if (!mFixture->osWindow)
{
mFixture->osWindow = OSWindow::New();
mFixture->osWindow->disableErrorMessageDialog();
if (!mFixture->osWindow->initialize(windowName.c_str(), 128, 128))
{
std::cerr << "Failed to initialize OS Window.";
......
util/OSWindow.h
......@@ -27,6 +27,7 @@ class ANGLE_UTIL_EXPORT OSWindow
virtual bool initialize(const std::string &name, int width, int height) = 0;
virtual void destroy() = 0;
virtual void disableErrorMessageDialog() = 0;
int getX() const;
int getY() const;
......
util/android/AndroidWindow.cpp
......@@ -31,6 +31,8 @@ bool AndroidWindow::initialize(const std::string &name, int width, int height)
}
void AndroidWindow::destroy() {}
void AndroidWindow::disableErrorMessageDialog() {}
void AndroidWindow::resetNativeWindow() {}
EGLNativeWindowType AndroidWindow::getNativeWindow() const
......
util/android/AndroidWindow.h
......@@ -18,6 +18,7 @@ class AndroidWindow : public OSWindow
~AndroidWindow() override;
bool initialize(const std::string &name, int width, int height) override;
void disableErrorMessageDialog() override;
void destroy() override;
void resetNativeWindow() override;
......
util/fuchsia/ScenicWindow.cpp
......@@ -114,6 +114,8 @@ bool ScenicWindow::initialize(const std::string &name, int width, int height)
return true;
}
void ScenicWindow::disableErrorMessageDialog() {}
void ScenicWindow::destroy()
{
while (mInFlightPresents != 0 && !mLostSession)
......
util/fuchsia/ScenicWindow.h
......@@ -42,6 +42,7 @@ class ANGLE_UTIL_EXPORT ScenicWindow : public OSWindow
// OSWindow:
bool initialize(const std::string &name, int width, int height) override;
void disableErrorMessageDialog() override;
void destroy() override;
void resetNativeWindow() override;
EGLNativeWindowType getNativeWindow() const override;
......
util/osx/OSXWindow.h
......@@ -36,6 +36,7 @@ class OSXWindow : public OSWindow
~OSXWindow() override;
bool initialize(const std::string &name, int width, int height) override;
void disableErrorMessageDialog() override;
void destroy() override;
void resetNativeWindow() override;
......
util/osx/OSXWindow.mm
......@@ -676,6 +676,8 @@ bool OSXWindow::initialize(const std::string &name, int width, int height)
return true;
}
void OSXWindow::disableErrorMessageDialog() {}
void OSXWindow::destroy()
{
AllWindows().erase(this);
......
util/ozone/OzoneWindow.cpp
......@@ -27,6 +27,8 @@ bool OzoneWindow::initialize(const std::string &name, int width, int height)
return true;
}
void OzoneWindow::disableErrorMessageDialog() {}
void OzoneWindow::destroy() {}
void OzoneWindow::resetNativeWindow() {}
......
util/ozone/OzoneWindow.h
......@@ -20,6 +20,7 @@ class OzoneWindow : public OSWindow
~OzoneWindow() override;
bool initialize(const std::string &name, int width, int height) override;
void disableErrorMessageDialog() override;
void destroy() override;
void resetNativeWindow() override;
......
util/windows/win32/Win32Window.cpp
......@@ -8,6 +8,7 @@
#include "util/windows/win32/Win32Window.h"
#include <crtdbg.h>
#include <sstream>
#include "common/debug.h"
......@@ -572,6 +573,12 @@ bool Win32Window::initialize(const std::string &name, int width, int height)
return true;
}
void Win32Window::disableErrorMessageDialog()
{
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);
}
void Win32Window::destroy()
{
if (mNativeDisplay)
......
util/windows/win32/Win32Window.h
......@@ -23,6 +23,7 @@ class Win32Window : public OSWindow
bool initialize(const std::string &name, int width, int height) override;
void destroy() override;
void disableErrorMessageDialog() override;
bool takeScreenshot(uint8_t *pixelData) override;
......
util/x11/X11Window.cpp
......@@ -371,6 +371,8 @@ bool X11Window::initialize(const std::string &name, int width, int height)
return true;
}
void X11Window::disableErrorMessageDialog() {}
void X11Window::destroy()
{
if (mWindow)
......
util/x11/X11Window.h
......@@ -25,6 +25,7 @@ class ANGLE_UTIL_EXPORT X11Window : public OSWindow
~X11Window() override;
bool initialize(const std::string &name, int width, int height) override;
void disableErrorMessageDialog() override;
void destroy() override;
void resetNativeWindow() override;
......
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