Skip to content

A
angle
Commit e4e45066 by daniel@transgaming.com
Options

Renamed VertexBuffer to VertexBufferInterface.

TRAC #22225 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1585 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 593ebc41
Showing with 46 additions and 46 deletions
src/libGLESv2/Buffer.cpp
......@@ -61,7 +61,7 @@ void Buffer::bufferData(const void *data, GLsizeiptr size, GLenum usage)
if (usage == GL_STATIC_DRAW)
{
mStaticVertexBuffer = new rx::StaticVertexBuffer(mRenderer);
mStaticVertexBuffer = new rx::StaticVertexBufferInterface(mRenderer);
mStaticIndexBuffer = new rx::StaticIndexBuffer(mRenderer);
}
}
......@@ -78,7 +78,7 @@ void Buffer::bufferSubData(const void *data, GLsizeiptr size, GLintptr offset)
mUnmodifiedDataUse = 0;
}
rx::StaticVertexBuffer *Buffer::getStaticVertexBuffer()
rx::StaticVertexBufferInterface *Buffer::getStaticVertexBuffer()
{
return mStaticVertexBuffer;
}
......@@ -108,7 +108,7 @@ void Buffer::promoteStaticUsage(int dataSize)
if (mUnmodifiedDataUse > 3 * mSize)
{
mStaticVertexBuffer = new rx::StaticVertexBuffer(mRenderer);
mStaticVertexBuffer = new rx::StaticVertexBufferInterface(mRenderer);
mStaticIndexBuffer = new rx::StaticIndexBuffer(mRenderer);
}
}
......
src/libGLESv2/Buffer.h
......@@ -23,7 +23,7 @@
namespace rx
{
class StaticVertexBuffer;
class StaticVertexBufferInterface;
class StaticIndexBuffer;
}
......@@ -44,7 +44,7 @@ class Buffer : public RefCountObject
size_t size() const { return mSize; }
GLenum usage() const { return mUsage; }
rx::StaticVertexBuffer *getStaticVertexBuffer();
rx::StaticVertexBufferInterface *getStaticVertexBuffer();
rx::StaticIndexBuffer *getStaticIndexBuffer();
void invalidateStaticData();
void promoteStaticUsage(int dataSize);
......@@ -57,7 +57,7 @@ class Buffer : public RefCountObject
GLsizeiptr mSize;
GLenum mUsage;
rx::StaticVertexBuffer *mStaticVertexBuffer;
rx::StaticVertexBufferInterface *mStaticVertexBuffer;
rx::StaticIndexBuffer *mStaticIndexBuffer;
GLsizeiptr mUnmodifiedDataUse;
};
......
src/libGLESv2/renderer/VertexBuffer.cpp
......@@ -14,9 +14,9 @@
namespace rx
{
unsigned int VertexBuffer::mCurrentSerial = 1;
unsigned int VertexBufferInterface::mCurrentSerial = 1;
VertexBuffer::VertexBuffer(rx::Renderer9 *renderer, std::size_t size, DWORD usageFlags) : mRenderer(renderer), mVertexBuffer(NULL)
VertexBufferInterface::VertexBufferInterface(rx::Renderer9 *renderer, std::size_t size, DWORD usageFlags) : mRenderer(renderer), mVertexBuffer(NULL)
{
if (size > 0)
{
......@@ -35,7 +35,7 @@ VertexBuffer::VertexBuffer(rx::Renderer9 *renderer, std::size_t size, DWORD usag
mRequiredSpace = 0;
}
VertexBuffer::~VertexBuffer()
VertexBufferInterface::~VertexBufferInterface()
{
if (mVertexBuffer)
{
......@@ -43,7 +43,7 @@ VertexBuffer::~VertexBuffer()
}
}
void VertexBuffer::unmap()
void VertexBufferInterface::unmap()
{
if (mVertexBuffer)
{
......@@ -51,35 +51,35 @@ void VertexBuffer::unmap()
}
}
IDirect3DVertexBuffer9 *VertexBuffer::getBuffer() const
IDirect3DVertexBuffer9 *VertexBufferInterface::getBuffer() const
{
return mVertexBuffer;
}
unsigned int VertexBuffer::getSerial() const
unsigned int VertexBufferInterface::getSerial() const
{
return mSerial;
}
unsigned int VertexBuffer::issueSerial()
unsigned int VertexBufferInterface::issueSerial()
{
return mCurrentSerial++;
}
void VertexBuffer::addRequiredSpace(UINT requiredSpace)
void VertexBufferInterface::addRequiredSpace(UINT requiredSpace)
{
mRequiredSpace += requiredSpace;
}
StreamingVertexBuffer::StreamingVertexBuffer(rx::Renderer9 *renderer, std::size_t initialSize) : VertexBuffer(renderer, initialSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY)
StreamingVertexBufferInterface::StreamingVertexBufferInterface(rx::Renderer9 *renderer, std::size_t initialSize) : VertexBufferInterface(renderer, initialSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY)
{
}
StreamingVertexBuffer::~StreamingVertexBuffer()
StreamingVertexBufferInterface::~StreamingVertexBufferInterface()
{
}
void *StreamingVertexBuffer::map(const gl::VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *offset)
void *StreamingVertexBufferInterface::map(const gl::VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *offset)
{
void *mapPtr = NULL;
......@@ -100,7 +100,7 @@ void *StreamingVertexBuffer::map(const gl::VertexAttribute &attribute, std::size
return mapPtr;
}
void StreamingVertexBuffer::reserveRequiredSpace()
void StreamingVertexBufferInterface::reserveRequiredSpace()
{
if (mRequiredSpace > mBufferSize)
{
......@@ -138,15 +138,15 @@ void StreamingVertexBuffer::reserveRequiredSpace()
mRequiredSpace = 0;
}
StaticVertexBuffer::StaticVertexBuffer(rx::Renderer9 *renderer) : VertexBuffer(renderer, 0, D3DUSAGE_WRITEONLY)
StaticVertexBufferInterface::StaticVertexBufferInterface(rx::Renderer9 *renderer) : VertexBufferInterface(renderer, 0, D3DUSAGE_WRITEONLY)
{
}
StaticVertexBuffer::~StaticVertexBuffer()
StaticVertexBufferInterface::~StaticVertexBufferInterface()
{
}
void *StaticVertexBuffer::map(const gl::VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset)
void *StaticVertexBufferInterface::map(const gl::VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset)
{
void *mapPtr = NULL;
......@@ -171,7 +171,7 @@ void *StaticVertexBuffer::map(const gl::VertexAttribute &attribute, std::size_t
return mapPtr;
}
void StaticVertexBuffer::reserveRequiredSpace()
void StaticVertexBufferInterface::reserveRequiredSpace()
{
if (!mVertexBuffer && mBufferSize == 0)
{
......@@ -195,7 +195,7 @@ void StaticVertexBuffer::reserveRequiredSpace()
mRequiredSpace = 0;
}
std::size_t StaticVertexBuffer::lookupAttribute(const gl::VertexAttribute &attribute)
std::size_t StaticVertexBufferInterface::lookupAttribute(const gl::VertexAttribute &attribute)
{
for (unsigned int element = 0; element < mCache.size(); element++)
{
......
src/libGLESv2/renderer/VertexBuffer.h
......@@ -21,11 +21,11 @@
namespace rx
{
class VertexBuffer
class VertexBufferInterface
{
public:
VertexBuffer(rx::Renderer9 *renderer, std::size_t size, DWORD usageFlags);
virtual ~VertexBuffer();
VertexBufferInterface(rx::Renderer9 *renderer, std::size_t size, DWORD usageFlags);
virtual ~VertexBufferInterface();
void unmap();
virtual void *map(const gl::VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset) = 0;
......@@ -50,24 +50,24 @@ class VertexBuffer
std::size_t mRequiredSpace;
private:
DISALLOW_COPY_AND_ASSIGN(VertexBuffer);
DISALLOW_COPY_AND_ASSIGN(VertexBufferInterface);
};
class StreamingVertexBuffer : public VertexBuffer
class StreamingVertexBufferInterface : public VertexBufferInterface
{
public:
StreamingVertexBuffer(rx::Renderer9 *renderer, std::size_t initialSize);
~StreamingVertexBuffer();
StreamingVertexBufferInterface(rx::Renderer9 *renderer, std::size_t initialSize);
~StreamingVertexBufferInterface();
void *map(const gl::VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset);
void reserveRequiredSpace();
};
class StaticVertexBuffer : public VertexBuffer
class StaticVertexBufferInterface : public VertexBufferInterface
{
public:
explicit StaticVertexBuffer(rx::Renderer9 *renderer);
~StaticVertexBuffer();
explicit StaticVertexBufferInterface(rx::Renderer9 *renderer);
~StaticVertexBufferInterface();
void *map(const gl::VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset);
void reserveRequiredSpace();
......
src/libGLESv2/renderer/VertexDataManager.cpp
......@@ -52,7 +52,7 @@ VertexDataManager::VertexDataManager(Renderer9 *renderer) : mRenderer(renderer)
// D3D9_REPLACE
checkVertexCaps(renderer->getCapsDeclTypes());
mStreamingBuffer = new StreamingVertexBuffer(renderer, INITIAL_STREAM_BUFFER_SIZE);
mStreamingBuffer = new StreamingVertexBufferInterface(renderer, INITIAL_STREAM_BUFFER_SIZE);
if (!mStreamingBuffer)
{
......@@ -70,7 +70,7 @@ VertexDataManager::~VertexDataManager()
}
}
std::size_t VertexDataManager::writeAttributeData(VertexBuffer *vertexBuffer, GLint start, GLsizei count, const gl::VertexAttribute &attribute, GLsizei instances)
std::size_t VertexDataManager::writeAttributeData(VertexBufferInterface *vertexBuffer, GLint start, GLsizei count, const gl::VertexAttribute &attribute, GLsizei instances)
{
gl::Buffer *buffer = attribute.mBoundBuffer.get();
......@@ -142,7 +142,7 @@ GLenum VertexDataManager::prepareVertexData(const gl::VertexAttribute attribs[],
if (translated[i].active && attribs[i].mArrayEnabled)
{
gl::Buffer *buffer = attribs[i].mBoundBuffer.get();
StaticVertexBuffer *staticBuffer = buffer ? buffer->getStaticVertexBuffer() : NULL;
StaticVertexBufferInterface *staticBuffer = buffer ? buffer->getStaticVertexBuffer() : NULL;
if (staticBuffer)
{
......@@ -160,7 +160,7 @@ GLenum VertexDataManager::prepareVertexData(const gl::VertexAttribute attribs[],
if (translated[previous].active && attribs[previous].mArrayEnabled)
{
gl::Buffer *previousBuffer = attribs[previous].mBoundBuffer.get();
StaticVertexBuffer *previousStaticBuffer = previousBuffer ? previousBuffer->getStaticVertexBuffer() : NULL;
StaticVertexBufferInterface *previousStaticBuffer = previousBuffer ? previousBuffer->getStaticVertexBuffer() : NULL;
if (staticBuffer == previousStaticBuffer)
{
......@@ -187,8 +187,8 @@ GLenum VertexDataManager::prepareVertexData(const gl::VertexAttribute attribs[],
if (translated[i].active && attribs[i].mArrayEnabled)
{
gl::Buffer *buffer = attribs[i].mBoundBuffer.get();
VertexBuffer *staticBuffer = buffer ? buffer->getStaticVertexBuffer() : NULL;
VertexBuffer *vertexBuffer = staticBuffer ? staticBuffer : mStreamingBuffer;
VertexBufferInterface *staticBuffer = buffer ? buffer->getStaticVertexBuffer() : NULL;
VertexBufferInterface *vertexBuffer = staticBuffer ? staticBuffer : mStreamingBuffer;
if (vertexBuffer)
{
......@@ -215,8 +215,8 @@ GLenum VertexDataManager::prepareVertexData(const gl::VertexAttribute attribs[],
const FormatConverter &converter = formatConverter(attribs[i]);
StaticVertexBuffer *staticBuffer = buffer ? buffer->getStaticVertexBuffer() : NULL;
VertexBuffer *vertexBuffer = staticBuffer ? staticBuffer : static_cast<VertexBuffer*>(mStreamingBuffer);
StaticVertexBufferInterface *staticBuffer = buffer ? buffer->getStaticVertexBuffer() : NULL;
VertexBufferInterface *vertexBuffer = staticBuffer ? staticBuffer : static_cast<VertexBufferInterface*>(mStreamingBuffer);
std::size_t streamOffset = -1;
......@@ -265,10 +265,10 @@ GLenum VertexDataManager::prepareVertexData(const gl::VertexAttribute attribs[],
{
if (!mCurrentValueBuffer[i])
{
mCurrentValueBuffer[i] = new StreamingVertexBuffer(mRenderer, CONSTANT_VERTEX_BUFFER_SIZE);
mCurrentValueBuffer[i] = new StreamingVertexBufferInterface(mRenderer, CONSTANT_VERTEX_BUFFER_SIZE);
}
StreamingVertexBuffer *buffer = mCurrentValueBuffer[i];
StreamingVertexBufferInterface *buffer = mCurrentValueBuffer[i];
if (mCurrentValue[i][0] != attribs[i].mCurrentValue[0] ||
mCurrentValue[i][1] != attribs[i].mCurrentValue[1] ||
......
src/libGLESv2/renderer/VertexDataManager.h
......@@ -47,14 +47,14 @@ class VertexDataManager
DISALLOW_COPY_AND_ASSIGN(VertexDataManager);
std::size_t spaceRequired(const gl::VertexAttribute &attrib, std::size_t count, GLsizei instances) const;
std::size_t writeAttributeData(VertexBuffer *vertexBuffer, GLint start, GLsizei count, const gl::VertexAttribute &attribute, GLsizei instances);
std::size_t writeAttributeData(VertexBufferInterface *vertexBuffer, GLint start, GLsizei count, const gl::VertexAttribute &attribute, GLsizei instances);
rx::Renderer9 *const mRenderer; // D3D9_REPLACE
StreamingVertexBuffer *mStreamingBuffer;
StreamingVertexBufferInterface *mStreamingBuffer;
float mCurrentValue[gl::MAX_VERTEX_ATTRIBS][4];
StreamingVertexBuffer *mCurrentValueBuffer[gl::MAX_VERTEX_ATTRIBS];
StreamingVertexBufferInterface *mCurrentValueBuffer[gl::MAX_VERTEX_ATTRIBS];
std::size_t mCurrentValueOffsets[gl::MAX_VERTEX_ATTRIBS];
// Attribute format conversion
......
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