Hash :
e6124500
Author :
Date :
2020-06-02T12:02:55
Fix baseVertex and baseInstance with streaming attributes baseInstance: Fixed by adding the intial offset to each copy for streaming attributes baseVertex: make sure mShaderConstants.onFirstVertexChange takes in correct firstVertex value for dynamic attribs (where firstVertex passed to StateManager11::updateState already include baseVertex) Bug: chromium:1078330, angleproject:3402 Change-Id: I289c4e3733fdf6f78af8c3adee84112c05a5abce Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2227022 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Shrek Shao <shrekshao@google.com>
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 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200
//
// 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 "angle_unittests_utils.h"
#include "libANGLE/renderer/d3d/BufferD3D.h"
#include "libANGLE/renderer/d3d/IndexBuffer.h"
#include "libANGLE/renderer/d3d/IndexDataManager.h"
using namespace testing;
namespace
{
constexpr unsigned int kIterationsPerStep = 100;
class MockIndexBuffer : public rx::IndexBuffer
{
public:
MockIndexBuffer(unsigned int bufferSize, gl::DrawElementsType indexType)
: mBufferSize(bufferSize), mIndexType(indexType)
{}
MOCK_METHOD4(initialize,
angle::Result(const gl::Context *, unsigned int, gl::DrawElementsType, bool));
MOCK_METHOD4(mapBuffer,
angle::Result(const gl::Context *, unsigned int, unsigned int, void **));
MOCK_METHOD1(unmapBuffer, angle::Result(const gl::Context *));
MOCK_METHOD1(discard, angle::Result(const gl::Context *));
MOCK_METHOD3(setSize, angle::Result(const gl::Context *, unsigned int, gl::DrawElementsType));
// inlined for speed
gl::DrawElementsType getIndexType() const override { return mIndexType; }
unsigned int getBufferSize() const override { return mBufferSize; }
private:
unsigned int mBufferSize;
gl::DrawElementsType mIndexType;
};
class MockBufferFactoryD3D : public rx::BufferFactoryD3D
{
public:
MockBufferFactoryD3D(unsigned int bufferSize, gl::DrawElementsType indexType)
: mBufferSize(bufferSize), mIndexType(indexType)
{}
MOCK_METHOD0(createVertexBuffer, rx::VertexBuffer *());
MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(angle::FormatID));
MOCK_CONST_METHOD1(getVertexComponentType, GLenum(angle::FormatID));
MOCK_CONST_METHOD7(getVertexSpaceRequired,
angle::Result(const gl::Context *,
const gl::VertexAttribute &,
const gl::VertexBinding &,
size_t,
GLsizei,
GLuint,
unsigned int *));
// Dependency injection
rx::IndexBuffer *createIndexBuffer() override
{
return new MockIndexBuffer(mBufferSize, mIndexType);
}
private:
unsigned int mBufferSize;
gl::DrawElementsType mIndexType;
};
class MockBufferD3D : public rx::BufferD3D
{
public:
MockBufferD3D(rx::BufferFactoryD3D *factory) : BufferD3D(mockState, factory), mData() {}
// BufferImpl
angle::Result setData(const gl::Context *context,
gl::BufferBinding target,
const void *data,
size_t size,
gl::BufferUsage) override
{
mData.resize(size);
if (data && size > 0)
{
memcpy(&mData[0], data, size);
}
return angle::Result::Continue;
}
MOCK_METHOD5(
setSubData,
angle::Result(const gl::Context *, gl::BufferBinding, const void *, size_t, size_t));
MOCK_METHOD5(copySubData,
angle::Result(const gl::Context *, BufferImpl *, GLintptr, GLintptr, GLsizeiptr));
MOCK_METHOD3(map, angle::Result(const gl::Context *context, GLenum, void **));
MOCK_METHOD5(mapRange, angle::Result(const gl::Context *, size_t, size_t, GLbitfield, void **));
MOCK_METHOD2(unmap, angle::Result(const gl::Context *context, GLboolean *));
// BufferD3D
MOCK_METHOD1(markTransformFeedbackUsage, angle::Result(const gl::Context *));
// inlined for speed
bool supportsDirectBinding() const override { return false; }
size_t getSize() const override { return mData.size(); }
angle::Result getData(const gl::Context *context, const uint8_t **outData) override
{
*outData = &mData[0];
return angle::Result::Continue;
}
private:
gl::BufferState mockState;
std::vector<uint8_t> mData;
};
class MockGLFactoryD3D : public rx::MockGLFactory
{
public:
MockGLFactoryD3D(MockBufferFactoryD3D *bufferFactory) : mBufferFactory(bufferFactory) {}
rx::BufferImpl *createBuffer(const gl::BufferState &state) override
{
MockBufferD3D *mockBufferD3D = new MockBufferD3D(mBufferFactory);
EXPECT_CALL(*mBufferFactory, createVertexBuffer())
.WillOnce(Return(nullptr))
.RetiresOnSaturation();
mockBufferD3D->initializeStaticData(nullptr);
return mockBufferD3D;
}
MockBufferFactoryD3D *mBufferFactory;
};
class IndexDataManagerPerfTest : public ANGLEPerfTest
{
public:
IndexDataManagerPerfTest();
void step() override;
rx::IndexDataManager mIndexDataManager;
GLsizei mIndexCount;
unsigned int mBufferSize;
MockBufferFactoryD3D mMockBufferFactory;
MockGLFactoryD3D mMockGLFactory;
gl::Buffer mIndexBuffer;
};
IndexDataManagerPerfTest::IndexDataManagerPerfTest()
: ANGLEPerfTest("IndexDataManager", "", "_run", kIterationsPerStep),
mIndexDataManager(&mMockBufferFactory),
mIndexCount(4000),
mBufferSize(mIndexCount * sizeof(GLushort)),
mMockBufferFactory(mBufferSize, gl::DrawElementsType::UnsignedShort),
mMockGLFactory(&mMockBufferFactory),
mIndexBuffer(&mMockGLFactory, {1})
{
std::vector<GLushort> indexData(mIndexCount);
for (GLsizei index = 0; index < mIndexCount; ++index)
{
indexData[index] = static_cast<GLushort>(index);
}
EXPECT_EQ(
angle::Result::Continue,
mIndexBuffer.bufferData(nullptr, gl::BufferBinding::Array, &indexData[0],
indexData.size() * sizeof(GLushort), gl::BufferUsage::StaticDraw));
}
void IndexDataManagerPerfTest::step()
{
rx::TranslatedIndexData translatedIndexData;
gl::IndexRange indexRange;
for (unsigned int iteration = 0; iteration < kIterationsPerStep; ++iteration)
{
(void)mIndexBuffer.getIndexRange(nullptr, gl::DrawElementsType::UnsignedShort, 0,
mIndexCount, false, &indexRange);
(void)mIndexDataManager.prepareIndexData(nullptr, gl::DrawElementsType::UnsignedShort,
gl::DrawElementsType::UnsignedShort, mIndexCount,
&mIndexBuffer, nullptr, &translatedIndexData);
}
}
TEST_F(IndexDataManagerPerfTest, Run)
{
run();
}
} // anonymous namespace