Hash :
7c985f5c
Author :
Date :
2018-11-29T18:16:17
Make angle::Result an enum. This moves away from a class type to a value type. This should improve performance when using angle::Result as a return value. Previously the generated code would return a pointer instead of a value. Improves performance in the most targeted microbenchmark by 10%. In more realistic scanarios it will have a smaller improvement. Also simplifies the class implementation and usage. Includes some unrelated code generation changes. Bug: angleproject:2491 Change-Id: Ifcf86870bf1c00a2f73c39ea6e4f05ca705050aa Reviewed-on: https://chromium-review.googlesource.com/c/1356139 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153
//
// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "libANGLE/Fence.h"
#include "libANGLE/renderer/FenceNVImpl.h"
#include "libANGLE/renderer/SyncImpl.h"
using ::testing::_;
using ::testing::Return;
using ::testing::SetArgumentPointee;
namespace
{
//
// FenceNV tests
//
class MockFenceNVImpl : public rx::FenceNVImpl
{
public:
virtual ~MockFenceNVImpl() { destroy(); }
MOCK_METHOD2(set, angle::Result(const gl::Context *, GLenum));
MOCK_METHOD2(test, angle::Result(const gl::Context *, GLboolean *));
MOCK_METHOD1(finish, angle::Result(const gl::Context *));
MOCK_METHOD0(destroy, void());
};
class FenceNVTest : public testing::Test
{
protected:
virtual void SetUp()
{
mImpl = new MockFenceNVImpl;
EXPECT_CALL(*mImpl, destroy());
mFence = new gl::FenceNV(mImpl);
}
virtual void TearDown() { delete mFence; }
MockFenceNVImpl *mImpl;
gl::FenceNV *mFence;
};
TEST_F(FenceNVTest, DestructionDeletesImpl)
{
MockFenceNVImpl *impl = new MockFenceNVImpl;
EXPECT_CALL(*impl, destroy()).Times(1).RetiresOnSaturation();
gl::FenceNV *fence = new gl::FenceNV(impl);
delete fence;
// Only needed because the mock is leaked if bugs are present,
// which logs an error, but does not cause the test to fail.
// Ordinarily mocks are verified when destroyed.
testing::Mock::VerifyAndClear(impl);
}
TEST_F(FenceNVTest, SetAndTestBehavior)
{
EXPECT_CALL(*mImpl, set(_, _)).WillOnce(Return(angle::Result::Continue)).RetiresOnSaturation();
EXPECT_FALSE(mFence->isSet());
EXPECT_EQ(angle::Result::Continue, mFence->set(nullptr, GL_ALL_COMPLETED_NV));
EXPECT_TRUE(mFence->isSet());
// Fake the behavior of testing the fence before and after it's passed.
EXPECT_CALL(*mImpl, test(_, _))
.WillOnce(DoAll(SetArgumentPointee<1>(GL_FALSE), Return(angle::Result::Continue)))
.WillOnce(DoAll(SetArgumentPointee<1>(GL_TRUE), Return(angle::Result::Continue)))
.RetiresOnSaturation();
GLboolean out;
EXPECT_EQ(angle::Result::Continue, mFence->test(nullptr, &out));
EXPECT_EQ(GL_FALSE, out);
EXPECT_EQ(angle::Result::Continue, mFence->test(nullptr, &out));
EXPECT_EQ(GL_TRUE, out);
}
//
// Sync tests
//
class MockSyncImpl : public rx::SyncImpl
{
public:
virtual ~MockSyncImpl() { destroy(); }
MOCK_METHOD3(set, angle::Result(const gl::Context *, GLenum, GLbitfield));
MOCK_METHOD4(clientWait, angle::Result(const gl::Context *, GLbitfield, GLuint64, GLenum *));
MOCK_METHOD3(serverWait, angle::Result(const gl::Context *, GLbitfield, GLuint64));
MOCK_METHOD2(getStatus, angle::Result(const gl::Context *, GLint *));
MOCK_METHOD0(destroy, void());
};
class FenceSyncTest : public testing::Test
{
protected:
virtual void SetUp()
{
mImpl = new MockSyncImpl;
EXPECT_CALL(*mImpl, destroy());
mFence = new gl::Sync(mImpl, 1);
mFence->addRef();
}
virtual void TearDown() { mFence->release(nullptr); }
MockSyncImpl *mImpl;
gl::Sync *mFence;
};
TEST_F(FenceSyncTest, DestructionDeletesImpl)
{
MockSyncImpl *impl = new MockSyncImpl;
EXPECT_CALL(*impl, destroy()).Times(1).RetiresOnSaturation();
gl::Sync *fence = new gl::Sync(impl, 1);
fence->addRef();
fence->release(nullptr);
// Only needed because the mock is leaked if bugs are present,
// which logs an error, but does not cause the test to fail.
// Ordinarily mocks are verified when destroyed.
testing::Mock::VerifyAndClear(impl);
}
TEST_F(FenceSyncTest, SetAndGetStatusBehavior)
{
EXPECT_CALL(*mImpl, set(_, _, _))
.WillOnce(Return(angle::Result::Continue))
.RetiresOnSaturation();
EXPECT_EQ(angle::Result::Continue, mFence->set(nullptr, GL_SYNC_GPU_COMMANDS_COMPLETE, 0));
EXPECT_EQ(static_cast<GLenum>(GL_SYNC_GPU_COMMANDS_COMPLETE), mFence->getCondition());
// Fake the behavior of testing the fence before and after it's passed.
EXPECT_CALL(*mImpl, getStatus(_, _))
.WillOnce(DoAll(SetArgumentPointee<1>(GL_UNSIGNALED), Return(angle::Result::Continue)))
.WillOnce(DoAll(SetArgumentPointee<1>(GL_SIGNALED), Return(angle::Result::Continue)))
.RetiresOnSaturation();
GLint out;
EXPECT_EQ(angle::Result::Continue, mFence->getStatus(nullptr, &out));
EXPECT_EQ(GL_UNSIGNALED, out);
EXPECT_EQ(angle::Result::Continue, mFence->getStatus(nullptr, &out));
EXPECT_EQ(GL_SIGNALED, out);
}
} // namespace