Hash :
520c4ae2
Author :
Date :
2015-05-05T13:12:36
Add a Buffer::getIndexRange function. Instead of exposing the index range cache, add a more generic method that allows the buffers to handle their own caching of index ranges. BufferImpl::getData can be hard to implement for BufferGL because there isn't a way to tell the buffer to unmap and glGetBufferSubData can be very expensive, requiring an extra copy of the data. BUG=angleproject:881 Change-Id: Idec645219056132e0d72a410fbe7b971fa02c9e9 Reviewed-on: https://chromium-review.googlesource.com/261892 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Tested-by: Geoff Lang <geofflang@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 154 155 156 157 158 159 160 161
//
// Copyright 2015 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.
//
// IndexDataManagerPerfTest:
// Performance test for index buffer management.
//
#include "ANGLEPerfTest.h"
#include <gmock/gmock.h>
#include "libANGLE/renderer/d3d/BufferD3D.h"
#include "libANGLE/renderer/d3d/IndexBuffer.h"
#include "libANGLE/renderer/d3d/IndexDataManager.h"
using namespace testing;
namespace
{
class MockIndexBuffer : public rx::IndexBuffer
{
public:
MockIndexBuffer(unsigned int bufferSize, GLenum indexType)
: mBufferSize(bufferSize),
mIndexType(indexType)
{
}
MOCK_METHOD3(initialize, gl::Error(unsigned int, GLenum, bool));
MOCK_METHOD3(mapBuffer, gl::Error(unsigned int, unsigned int, void**));
MOCK_METHOD0(unmapBuffer, gl::Error());
MOCK_METHOD0(discard, gl::Error());
MOCK_METHOD2(setSize, gl::Error(unsigned int, GLenum));
// inlined for speed
GLenum getIndexType() const override { return mIndexType; }
unsigned int getBufferSize() const override { return mBufferSize; }
private:
unsigned int mBufferSize;
GLenum mIndexType;
};
class MockBufferFactoryD3D : public rx::BufferFactoryD3D
{
public:
MockBufferFactoryD3D(unsigned int bufferSize, GLenum indexType)
: mBufferSize(bufferSize),
mIndexType(indexType)
{
}
MOCK_METHOD0(createVertexBuffer, rx::VertexBuffer*());
MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(const gl::VertexFormat &));
MOCK_CONST_METHOD1(getVertexComponentType, GLenum(const gl::VertexFormat &));
// Dependency injection
rx::IndexBuffer* createIndexBuffer() override
{
return new MockIndexBuffer(mBufferSize, mIndexType);
}
private:
unsigned int mBufferSize;
GLenum mIndexType;
};
class MockBufferD3D : public rx::BufferD3D
{
public:
MockBufferD3D(rx::BufferFactoryD3D *factory, size_t bufferSize)
: BufferD3D(factory),
mBufferSize(bufferSize)
{
}
// BufferImpl
MOCK_METHOD3(setData, gl::Error(const void*, size_t, GLenum));
MOCK_METHOD3(setSubData, gl::Error(const void*, size_t, size_t));
MOCK_METHOD4(copySubData, gl::Error(BufferImpl*, GLintptr, GLintptr, GLsizeiptr));
MOCK_METHOD2(map, gl::Error(GLenum, GLvoid **));
MOCK_METHOD4(mapRange, gl::Error(size_t, size_t, GLbitfield, GLvoid **));
MOCK_METHOD1(unmap, gl::Error(GLboolean *));
// BufferD3D
MOCK_METHOD0(markTransformFeedbackUsage, void());
// inlined for speed
bool supportsDirectBinding() const override { return false; }
size_t getSize() const override { return mBufferSize; }
gl::Error getData(const uint8_t **) override { return gl::Error(GL_NO_ERROR); }
private:
size_t mBufferSize;
};
class IndexDataManagerPerfTest : public ANGLEPerfTest
{
public:
IndexDataManagerPerfTest();
void step(float dt, double totalTime) override;
rx::IndexDataManager mIndexDataManager;
GLsizei mIndexCount;
unsigned int mBufferSize;
MockBufferFactoryD3D mMockFactory;
gl::Buffer mIndexBuffer;
std::vector<GLshort> mIndexData;
};
MockBufferD3D *InitMockBufferD3D(MockBufferFactoryD3D *mockFactory, unsigned int bufferSize)
{
MockBufferD3D *mockBufferD3D = new MockBufferD3D(mockFactory, static_cast<size_t>(bufferSize));
EXPECT_CALL(*mockFactory, createVertexBuffer()).WillOnce(Return(nullptr)).RetiresOnSaturation();
mockBufferD3D->initializeStaticData();
return mockBufferD3D;
}
IndexDataManagerPerfTest::IndexDataManagerPerfTest()
: ANGLEPerfTest("IndexDataManger", "_run"),
mIndexDataManager(&mMockFactory, rx::RENDERER_D3D11),
mIndexCount(4000),
mBufferSize(mIndexCount * 2),
mMockFactory(mBufferSize, GL_UNSIGNED_SHORT),
mIndexBuffer(InitMockBufferD3D(&mMockFactory, mBufferSize), 1),
mIndexData(mIndexCount)
{
for (GLsizei index = 0; index < mIndexCount; ++index)
{
mIndexData[index] = static_cast<GLshort>(index);
}
}
void IndexDataManagerPerfTest::step(float dt, double totalTime)
{
rx::TranslatedIndexData translatedIndexData;
for (unsigned int iteration = 0; iteration < 100; ++iteration)
{
mIndexBuffer.getIndexRange(GL_UNSIGNED_SHORT, 0, mIndexCount, &translatedIndexData.indexRange);
mIndexDataManager.prepareIndexData(GL_UNSIGNED_SHORT, mIndexCount, &mIndexBuffer, nullptr, &translatedIndexData);
}
if (mTimer->getElapsedTime() >= 5.0)
{
mRunning = false;
}
}
TEST_F(IndexDataManagerPerfTest, Run)
{
run();
}
}