Skip to content

A
angle
Commit b3f4e8d1 by Jamie Madill
Options

Refactor VertexDataManager's current value cache.

This clears the way for future optimizations. BUG=angleproject:959 Change-Id: Ief9077159e1e5fed5670862454a6f0b41d630551 Reviewed-on: https://chromium-review.googlesource.com/277280Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent f9327d33
Showing with 51 additions and 45 deletions
src/libANGLE/renderer/d3d/VertexDataManager.cpp
......@@ -55,20 +55,28 @@ static int StreamingBufferElementCount(const gl::VertexAttribute &attrib, int ve
return vertexDrawCount;
}
VertexDataManager::VertexDataManager(BufferFactoryD3D *factory)
: mFactory(factory)
VertexDataManager::CurrentValueState::CurrentValueState()
: buffer(nullptr),
offset(0)
{
for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; i++)
{
mCurrentValue[i].FloatValues[0] = std::numeric_limits<float>::quiet_NaN();
mCurrentValue[i].FloatValues[1] = std::numeric_limits<float>::quiet_NaN();
mCurrentValue[i].FloatValues[2] = std::numeric_limits<float>::quiet_NaN();
mCurrentValue[i].FloatValues[3] = std::numeric_limits<float>::quiet_NaN();
mCurrentValue[i].Type = GL_FLOAT;
mCurrentValueBuffer[i] = NULL;
mCurrentValueOffsets[i] = 0;
}
data.FloatValues[0] = std::numeric_limits<float>::quiet_NaN();
data.FloatValues[1] = std::numeric_limits<float>::quiet_NaN();
data.FloatValues[2] = std::numeric_limits<float>::quiet_NaN();
data.FloatValues[3] = std::numeric_limits<float>::quiet_NaN();
data.Type = GL_FLOAT;
}
VertexDataManager::CurrentValueState::~CurrentValueState()
{
SafeDelete(buffer);
}
VertexDataManager::VertexDataManager(BufferFactoryD3D *factory)
: mFactory(factory),
mStreamingBuffer(nullptr),
// TODO(jmadill): use context caps
mCurrentValueCache(gl::MAX_VERTEX_ATTRIBS)
{
mStreamingBuffer = new StreamingVertexBufferInterface(factory, INITIAL_STREAM_BUFFER_SIZE);
if (!mStreamingBuffer)
......@@ -79,12 +87,7 @@ VertexDataManager::VertexDataManager(BufferFactoryD3D *factory)
VertexDataManager::~VertexDataManager()
{
delete mStreamingBuffer;
for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; i++)
{
delete mCurrentValueBuffer[i];
}
SafeDelete(mStreamingBuffer);
}
void VertexDataManager::hintUnmapAllResources(const std::vector<gl::VertexAttribute> &vertexAttributes)
......@@ -107,11 +110,11 @@ void VertexDataManager::hintUnmapAllResources(const std::vector<gl::VertexAttrib
}
}
for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; i++)
for (auto &currentValue : mCurrentValueCache)
{
if (mCurrentValueBuffer[i] != NULL)
if (currentValue.buffer != nullptr)
{
mCurrentValueBuffer[i]->getVertexBuffer()->hintUnmapResource();
currentValue.buffer->getVertexBuffer()->hintUnmapResource();
}
}
}
......@@ -169,14 +172,15 @@ gl::Error VertexDataManager::prepareVertexData(const gl::State &state, GLint sta
}
else
{
if (!mCurrentValueBuffer[i])
if (mCurrentValueCache[i].buffer == nullptr)
{
mCurrentValueBuffer[i] = new StreamingVertexBufferInterface(mFactory, CONSTANT_VERTEX_BUFFER_SIZE);
mCurrentValueCache[i].buffer = new StreamingVertexBufferInterface(mFactory, CONSTANT_VERTEX_BUFFER_SIZE);
}
gl::Error error = storeCurrentValue(curAttrib, state.getVertexAttribCurrentValue(i), &translated[i],
&mCurrentValue[i], &mCurrentValueOffsets[i],
mCurrentValueBuffer[i]);
gl::Error error = storeCurrentValue(curAttrib,
state.getVertexAttribCurrentValue(i),
&translated[i],
&mCurrentValueCache[i]);
if (error.isError())
{
hintUnmapAllResources(vertexAttributes);
......@@ -357,38 +361,36 @@ gl::Error VertexDataManager::storeAttribute(const gl::VertexAttribute &attrib,
gl::Error VertexDataManager::storeCurrentValue(const gl::VertexAttribute &attrib,
const gl::VertexAttribCurrentValueData &currentValue,
TranslatedAttribute *translated,
gl::VertexAttribCurrentValueData *cachedValue,
size_t *cachedOffset,
StreamingVertexBufferInterface *buffer)
CurrentValueState *cachedState)
{
if (*cachedValue != currentValue)
if (cachedState->data != currentValue)
{
gl::Error error = buffer->reserveVertexSpace(attrib, 1, 0);
gl::Error error = cachedState->buffer->reserveVertexSpace(attrib, 1, 0);
if (error.isError())
{
return error;
}
unsigned int streamOffset;
error = buffer->storeVertexAttributes(attrib, currentValue, 0, 1, 0, &streamOffset);
error = cachedState->buffer->storeVertexAttributes(attrib, currentValue, 0, 1, 0, &streamOffset);
if (error.isError())
{
return error;
}
*cachedValue = currentValue;
*cachedOffset = streamOffset;
cachedState->data = currentValue;
cachedState->offset = streamOffset;
}
translated->storage = NULL;
translated->vertexBuffer = buffer->getVertexBuffer();
translated->serial = buffer->getSerial();
translated->vertexBuffer = cachedState->buffer->getVertexBuffer();
translated->serial = cachedState->buffer->getSerial();
translated->divisor = 0;
translated->attribute = &attrib;
translated->currentValueType = currentValue.Type;
translated->stride = 0;
translated->offset = *cachedOffset;
translated->offset = cachedState->offset;
return gl::Error(GL_NO_ERROR);
}
......
src/libANGLE/renderer/d3d/VertexDataManager.h
......@@ -56,6 +56,16 @@ class VertexDataManager : angle::NonCopyable
TranslatedAttribute *outAttribs, GLsizei instances);
private:
struct CurrentValueState
{
CurrentValueState();
~CurrentValueState();
StreamingVertexBufferInterface *buffer;
gl::VertexAttribCurrentValueData data;
size_t offset;
};
gl::Error reserveSpaceForAttrib(const gl::VertexAttribute &attrib,
const gl::VertexAttribCurrentValueData &currentValue,
GLsizei count,
......@@ -74,20 +84,14 @@ class VertexDataManager : angle::NonCopyable
gl::Error storeCurrentValue(const gl::VertexAttribute &attrib,
const gl::VertexAttribCurrentValueData &currentValue,
TranslatedAttribute *translated,
gl::VertexAttribCurrentValueData *cachedValue,
size_t *cachedOffset,
StreamingVertexBufferInterface *buffer);
CurrentValueState *cachedState);
void hintUnmapAllResources(const std::vector<gl::VertexAttribute> &vertexAttributes);
BufferFactoryD3D *const mFactory;
StreamingVertexBufferInterface *mStreamingBuffer;
gl::VertexAttribCurrentValueData mCurrentValue[gl::MAX_VERTEX_ATTRIBS];
StreamingVertexBufferInterface *mCurrentValueBuffer[gl::MAX_VERTEX_ATTRIBS];
std::size_t mCurrentValueOffsets[gl::MAX_VERTEX_ATTRIBS];
std::vector<CurrentValueState> mCurrentValueCache;
};
}
......
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