Commit 2ef1e0fc by Jamie Madill Committed by Commit Bot

perf_test_runner: Enable all trace tests.

Will allow running "null" Mock ICD tests. Also fixes a crash running the Mock ICD with the overlay. Bug: angleproject:5736 Change-Id: I42e3943a0de00dbab3ee125f1946afd22b38fec6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2809096Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 31d48df1
...@@ -130,7 +130,8 @@ def main(raw_args): ...@@ -130,7 +130,8 @@ def main(raw_args):
print('Test name: %s' % args.test_name) print('Test name: %s' % args.test_name)
def get_results(metric, extra_args=[]): def get_results(metric, extra_args=[]):
run = [perftests_path, '--gtest_filter=%s' % args.test_name] + extra_args run = [perftests_path, '--enable-all-trace-tests',
'--gtest_filter=%s' % args.test_name] + extra_args
logging.info('running %s' % str(run)) logging.info('running %s' % str(run))
process = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE) process = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
output, err = process.communicate() output, err = process.communicate()
......
...@@ -47,7 +47,13 @@ angle::Result Overlay::init(const Context *context) ...@@ -47,7 +47,13 @@ angle::Result Overlay::init(const Context *context)
enableOverlayWidgetsFromEnvironment(); enableOverlayWidgetsFromEnvironment();
return mImplementation->init(context); bool success = false;
ANGLE_TRY(mImplementation->init(context, &success));
if (!success)
{
mState.mEnabledWidgetCount = 0;
}
return angle::Result::Continue;
} }
void Overlay::destroy(const gl::Context *context) void Overlay::destroy(const gl::Context *context)
......
...@@ -33,13 +33,13 @@ class OverlayImpl : angle::NonCopyable ...@@ -33,13 +33,13 @@ class OverlayImpl : angle::NonCopyable
virtual void onDestroy(const gl::Context *context) {} virtual void onDestroy(const gl::Context *context) {}
virtual angle::Result init(const gl::Context *context); virtual angle::Result init(const gl::Context *context, bool *successOut);
protected: protected:
const gl::OverlayState &mState; const gl::OverlayState &mState;
}; };
inline angle::Result OverlayImpl::init(const gl::Context *context) inline angle::Result OverlayImpl::init(const gl::Context *context, bool *successOut)
{ {
return angle::Result::Continue; return angle::Result::Continue;
} }
......
...@@ -23,12 +23,15 @@ OverlayVk::OverlayVk(const gl::OverlayState &state) ...@@ -23,12 +23,15 @@ OverlayVk::OverlayVk(const gl::OverlayState &state)
mSupportsSubgroupBallot(false), mSupportsSubgroupBallot(false),
mSupportsSubgroupArithmetic(false), mSupportsSubgroupArithmetic(false),
mRefreshCulledWidgets(false), mRefreshCulledWidgets(false),
mSubgroupSize{},
mPresentImageExtent{} mPresentImageExtent{}
{} {}
OverlayVk::~OverlayVk() = default; OverlayVk::~OverlayVk() = default;
angle::Result OverlayVk::init(const gl::Context *context) angle::Result OverlayVk::init(const gl::Context *context, bool *successOut)
{ {
*successOut = false;
ContextVk *contextVk = vk::GetImpl(context); ContextVk *contextVk = vk::GetImpl(context);
RendererVk *rendererVk = contextVk->getRenderer(); RendererVk *rendererVk = contextVk->getRenderer();
...@@ -66,7 +69,9 @@ angle::Result OverlayVk::init(const gl::Context *context) ...@@ -66,7 +69,9 @@ angle::Result OverlayVk::init(const gl::Context *context)
mRefreshCulledWidgets = true; mRefreshCulledWidgets = true;
return contextVk->flushImpl(nullptr); ANGLE_TRY(contextVk->flushImpl(nullptr));
*successOut = true;
return angle::Result::Continue;
} }
void OverlayVk::onDestroy(const gl::Context *context) void OverlayVk::onDestroy(const gl::Context *context)
......
...@@ -25,7 +25,7 @@ class OverlayVk : public OverlayImpl ...@@ -25,7 +25,7 @@ class OverlayVk : public OverlayImpl
OverlayVk(const gl::OverlayState &state); OverlayVk(const gl::OverlayState &state);
~OverlayVk() override; ~OverlayVk() override;
angle::Result init(const gl::Context *context) override; angle::Result init(const gl::Context *context, bool *successOut) override;
void onDestroy(const gl::Context *context) override; void onDestroy(const gl::Context *context) override;
angle::Result onPresent(ContextVk *contextVk, angle::Result onPresent(ContextVk *contextVk,
......
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