Renamed IndxBuffer to IndexBufferInterface.
TRAC #22237
Author: Geoff Lang
Signed-off-by: Shannon Woods
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1603 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/Buffer.cpp b/src/libGLESv2/Buffer.cpp
index d880cdf..bc1f24e 100644
--- a/src/libGLESv2/Buffer.cpp
+++ b/src/libGLESv2/Buffer.cpp
@@ -62,7 +62,7 @@
if (usage == GL_STATIC_DRAW)
{
mStaticVertexBuffer = new rx::StaticVertexBufferInterface(mRenderer);
- mStaticIndexBuffer = new rx::StaticIndexBuffer(mRenderer);
+ mStaticIndexBuffer = new rx::StaticIndexBufferInterface(mRenderer);
}
}
@@ -83,7 +83,7 @@
return mStaticVertexBuffer;
}
-rx::StaticIndexBuffer *Buffer::getStaticIndexBuffer()
+rx::StaticIndexBufferInterface *Buffer::getStaticIndexBuffer()
{
return mStaticIndexBuffer;
}
@@ -109,7 +109,7 @@
if (mUnmodifiedDataUse > 3 * mSize)
{
mStaticVertexBuffer = new rx::StaticVertexBufferInterface(mRenderer);
- mStaticIndexBuffer = new rx::StaticIndexBuffer(mRenderer);
+ mStaticIndexBuffer = new rx::StaticIndexBufferInterface(mRenderer);
}
}
}
diff --git a/src/libGLESv2/Buffer.h b/src/libGLESv2/Buffer.h
index 4f5170e..9159455 100644
--- a/src/libGLESv2/Buffer.h
+++ b/src/libGLESv2/Buffer.h
@@ -24,7 +24,7 @@
namespace rx
{
class StaticVertexBufferInterface;
-class StaticIndexBuffer;
+class StaticIndexBufferInterface;
}
namespace gl
@@ -45,7 +45,7 @@
GLenum usage() const { return mUsage; }
rx::StaticVertexBufferInterface *getStaticVertexBuffer();
- rx::StaticIndexBuffer *getStaticIndexBuffer();
+ rx::StaticIndexBufferInterface *getStaticIndexBuffer();
void invalidateStaticData();
void promoteStaticUsage(int dataSize);
@@ -58,7 +58,7 @@
GLenum mUsage;
rx::StaticVertexBufferInterface *mStaticVertexBuffer;
- rx::StaticIndexBuffer *mStaticIndexBuffer;
+ rx::StaticIndexBufferInterface *mStaticIndexBuffer;
GLsizeiptr mUnmodifiedDataUse;
};
diff --git a/src/libGLESv2/renderer/IndexBuffer.cpp b/src/libGLESv2/renderer/IndexBuffer.cpp
index 703af92..f581969 100644
--- a/src/libGLESv2/renderer/IndexBuffer.cpp
+++ b/src/libGLESv2/renderer/IndexBuffer.cpp
@@ -14,9 +14,9 @@
namespace rx
{
-unsigned int IndexBuffer::mCurrentSerial = 1;
+unsigned int IndexBufferInterface::mCurrentSerial = 1;
-IndexBuffer::IndexBuffer(rx::Renderer9 *renderer, UINT size, D3DFORMAT format) : mRenderer(renderer), mBufferSize(size), mIndexBuffer(NULL)
+IndexBufferInterface::IndexBufferInterface(rx::Renderer9 *renderer, UINT size, D3DFORMAT format) : mRenderer(renderer), mBufferSize(size), mIndexBuffer(NULL)
{
if (size > 0)
{
@@ -31,7 +31,7 @@
}
}
-IndexBuffer::~IndexBuffer()
+IndexBufferInterface::~IndexBufferInterface()
{
if (mIndexBuffer)
{
@@ -39,22 +39,22 @@
}
}
-IDirect3DIndexBuffer9 *IndexBuffer::getBuffer() const
+IDirect3DIndexBuffer9 *IndexBufferInterface::getBuffer() const
{
return mIndexBuffer;
}
-unsigned int IndexBuffer::getSerial() const
+unsigned int IndexBufferInterface::getSerial() const
{
return mSerial;
}
-unsigned int IndexBuffer::issueSerial()
+unsigned int IndexBufferInterface::issueSerial()
{
return mCurrentSerial++;
}
-void IndexBuffer::unmap()
+void IndexBufferInterface::unmap()
{
if (mIndexBuffer)
{
@@ -62,16 +62,16 @@
}
}
-StreamingIndexBuffer::StreamingIndexBuffer(rx::Renderer9 *renderer, UINT initialSize, D3DFORMAT format) : IndexBuffer(renderer, initialSize, format)
+StreamingIndexBufferInterface::StreamingIndexBufferInterface(rx::Renderer9 *renderer, UINT initialSize, D3DFORMAT format) : IndexBufferInterface(renderer, initialSize, format)
{
mWritePosition = 0;
}
-StreamingIndexBuffer::~StreamingIndexBuffer()
+StreamingIndexBufferInterface::~StreamingIndexBufferInterface()
{
}
-void *StreamingIndexBuffer::map(UINT requiredSpace, UINT *offset)
+void *StreamingIndexBufferInterface::map(UINT requiredSpace, UINT *offset)
{
void *mapPtr = NULL;
@@ -92,7 +92,7 @@
return mapPtr;
}
-void StreamingIndexBuffer::reserveSpace(UINT requiredSpace, GLenum type)
+void StreamingIndexBufferInterface::reserveSpace(UINT requiredSpace, GLenum type)
{
if (requiredSpace > mBufferSize)
{
@@ -125,16 +125,16 @@
}
}
-StaticIndexBuffer::StaticIndexBuffer(rx::Renderer9 *renderer) : IndexBuffer(renderer, 0, D3DFMT_UNKNOWN)
+StaticIndexBufferInterface::StaticIndexBufferInterface(rx::Renderer9 *renderer) : IndexBufferInterface(renderer, 0, D3DFMT_UNKNOWN)
{
mCacheType = GL_NONE;
}
-StaticIndexBuffer::~StaticIndexBuffer()
+StaticIndexBufferInterface::~StaticIndexBufferInterface()
{
}
-void *StaticIndexBuffer::map(UINT requiredSpace, UINT *offset)
+void *StaticIndexBufferInterface::map(UINT requiredSpace, UINT *offset)
{
void *mapPtr = NULL;
@@ -154,7 +154,7 @@
return mapPtr;
}
-void StaticIndexBuffer::reserveSpace(UINT requiredSpace, GLenum type)
+void StaticIndexBufferInterface::reserveSpace(UINT requiredSpace, GLenum type)
{
if (!mIndexBuffer && mBufferSize == 0)
{
@@ -177,12 +177,12 @@
else UNREACHABLE(); // Static index buffers can't be resized
}
-bool StaticIndexBuffer::lookupType(GLenum type)
+bool StaticIndexBufferInterface::lookupType(GLenum type)
{
return mCacheType == type;
}
-UINT StaticIndexBuffer::lookupRange(intptr_t offset, GLsizei count, UINT *minIndex, UINT *maxIndex)
+UINT StaticIndexBufferInterface::lookupRange(intptr_t offset, GLsizei count, UINT *minIndex, UINT *maxIndex)
{
IndexRange range = {offset, count};
@@ -198,7 +198,7 @@
return res->second.streamOffset;
}
-void StaticIndexBuffer::addRange(intptr_t offset, GLsizei count, UINT minIndex, UINT maxIndex, UINT streamOffset)
+void StaticIndexBufferInterface::addRange(intptr_t offset, GLsizei count, UINT minIndex, UINT maxIndex, UINT streamOffset)
{
IndexRange indexRange = {offset, count};
IndexResult indexResult = {minIndex, maxIndex, streamOffset};
diff --git a/src/libGLESv2/renderer/IndexBuffer.h b/src/libGLESv2/renderer/IndexBuffer.h
index 75c6e8b..a955786 100644
--- a/src/libGLESv2/renderer/IndexBuffer.h
+++ b/src/libGLESv2/renderer/IndexBuffer.h
@@ -24,11 +24,11 @@
class Renderer9;
-class IndexBuffer
+class IndexBufferInterface
{
public:
- IndexBuffer(rx::Renderer9 *renderer, UINT size, D3DFORMAT format);
- virtual ~IndexBuffer();
+ IndexBufferInterface(rx::Renderer9 *renderer, UINT size, D3DFORMAT format);
+ virtual ~IndexBufferInterface();
UINT size() const { return mBufferSize; }
virtual void *map(UINT requiredSpace, UINT *offset) = 0;
@@ -49,14 +49,14 @@
static unsigned int mCurrentSerial;
private:
- DISALLOW_COPY_AND_ASSIGN(IndexBuffer);
+ DISALLOW_COPY_AND_ASSIGN(IndexBufferInterface);
};
-class StreamingIndexBuffer : public IndexBuffer
+class StreamingIndexBufferInterface : public IndexBufferInterface
{
public:
- StreamingIndexBuffer(rx::Renderer9 *renderer, UINT initialSize, D3DFORMAT format);
- ~StreamingIndexBuffer();
+ StreamingIndexBufferInterface(rx::Renderer9 *renderer, UINT initialSize, D3DFORMAT format);
+ ~StreamingIndexBufferInterface();
virtual void *map(UINT requiredSpace, UINT *offset);
virtual void reserveSpace(UINT requiredSpace, GLenum type);
@@ -65,11 +65,11 @@
UINT mWritePosition;
};
-class StaticIndexBuffer : public IndexBuffer
+class StaticIndexBufferInterface : public IndexBufferInterface
{
public:
- explicit StaticIndexBuffer(rx::Renderer9 *renderer);
- ~StaticIndexBuffer();
+ explicit StaticIndexBufferInterface(rx::Renderer9 *renderer);
+ ~StaticIndexBufferInterface();
virtual void *map(UINT requiredSpace, UINT *offset);
virtual void reserveSpace(UINT requiredSpace, GLenum type);
diff --git a/src/libGLESv2/renderer/IndexDataManager.cpp b/src/libGLESv2/renderer/IndexDataManager.cpp
index 08f89c2..4a02919 100644
--- a/src/libGLESv2/renderer/IndexDataManager.cpp
+++ b/src/libGLESv2/renderer/IndexDataManager.cpp
@@ -20,11 +20,11 @@
IndexDataManager::IndexDataManager(rx::Renderer9 *renderer) : mRenderer(renderer)
{
- mStreamingBufferShort = new StreamingIndexBuffer(mRenderer, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX16);
+ mStreamingBufferShort = new StreamingIndexBufferInterface(mRenderer, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX16);
if (renderer->get32BitIndexSupport())
{
- mStreamingBufferInt = new StreamingIndexBuffer(mRenderer, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX32);
+ mStreamingBufferInt = new StreamingIndexBufferInterface(mRenderer, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX32);
if (!mStreamingBufferInt)
{
@@ -135,10 +135,10 @@
indices = static_cast<const GLubyte*>(buffer->data()) + offset;
}
- StreamingIndexBuffer *streamingBuffer = (type == GL_UNSIGNED_INT) ? mStreamingBufferInt : mStreamingBufferShort;
+ StreamingIndexBufferInterface *streamingBuffer = (type == GL_UNSIGNED_INT) ? mStreamingBufferInt : mStreamingBufferShort;
- StaticIndexBuffer *staticBuffer = buffer ? buffer->getStaticIndexBuffer() : NULL;
- IndexBuffer *indexBuffer = streamingBuffer;
+ StaticIndexBufferInterface *staticBuffer = buffer ? buffer->getStaticIndexBuffer() : NULL;
+ IndexBufferInterface *indexBuffer = streamingBuffer;
UINT streamOffset = 0;
if (staticBuffer && staticBuffer->lookupType(type) && alignedOffset)
@@ -225,7 +225,7 @@
}
}
-StaticIndexBuffer *IndexDataManager::getCountingIndices(GLsizei count)
+StaticIndexBufferInterface *IndexDataManager::getCountingIndices(GLsizei count)
{
if (count <= 65536) // 16-bit indices
{
@@ -234,7 +234,7 @@
if (!mCountingBuffer || mCountingBuffer->size() < spaceNeeded)
{
delete mCountingBuffer;
- mCountingBuffer = new StaticIndexBuffer(mRenderer);
+ mCountingBuffer = new StaticIndexBufferInterface(mRenderer);
mCountingBuffer->reserveSpace(spaceNeeded, GL_UNSIGNED_SHORT);
UINT offset;
@@ -258,7 +258,7 @@
if (!mCountingBuffer || mCountingBuffer->size() < spaceNeeded)
{
delete mCountingBuffer;
- mCountingBuffer = new StaticIndexBuffer(mRenderer);
+ mCountingBuffer = new StaticIndexBufferInterface(mRenderer);
mCountingBuffer->reserveSpace(spaceNeeded, GL_UNSIGNED_INT);
UINT offset;
diff --git a/src/libGLESv2/renderer/IndexDataManager.h b/src/libGLESv2/renderer/IndexDataManager.h
index ff30f32..3eb6558 100644
--- a/src/libGLESv2/renderer/IndexDataManager.h
+++ b/src/libGLESv2/renderer/IndexDataManager.h
@@ -41,7 +41,7 @@
virtual ~IndexDataManager();
GLenum prepareIndexData(GLenum type, GLsizei count, gl::Buffer *arrayElementBuffer, const GLvoid *indices, TranslatedIndexData *translated, IDirect3DIndexBuffer9 **indexBuffer, unsigned int *serial);
- StaticIndexBuffer *getCountingIndices(GLsizei count);
+ StaticIndexBufferInterface *getCountingIndices(GLsizei count);
private:
DISALLOW_COPY_AND_ASSIGN(IndexDataManager);
@@ -51,9 +51,9 @@
rx::Renderer9 *const mRenderer; // D3D9_REPLACE
- StreamingIndexBuffer *mStreamingBufferShort;
- StreamingIndexBuffer *mStreamingBufferInt;
- StaticIndexBuffer *mCountingBuffer;
+ StreamingIndexBufferInterface *mStreamingBufferShort;
+ StreamingIndexBufferInterface *mStreamingBufferInt;
+ StaticIndexBufferInterface *mCountingBuffer;
};
}
diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 6ae6f44..87845cb 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -1220,7 +1220,7 @@
}
else if (instances > 0)
{
- StaticIndexBuffer *countingIB = mIndexDataManager->getCountingIndices(count);
+ StaticIndexBufferInterface *countingIB = mIndexDataManager->getCountingIndices(count);
if (countingIB)
{
if (mAppliedIBSerial != countingIB->getSerial())
@@ -1283,7 +1283,7 @@
if (!mLineLoopIB)
{
- mLineLoopIB = new StreamingIndexBuffer(this, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX32);
+ mLineLoopIB = new StreamingIndexBufferInterface(this, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX32);
}
if (mLineLoopIB)
@@ -1340,7 +1340,7 @@
if (!mLineLoopIB)
{
- mLineLoopIB = new StreamingIndexBuffer(this, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX16);
+ mLineLoopIB = new StreamingIndexBufferInterface(this, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX16);
}
if (mLineLoopIB)
diff --git a/src/libGLESv2/renderer/Renderer9.h b/src/libGLESv2/renderer/Renderer9.h
index 47c816a..fb4b4bb 100644
--- a/src/libGLESv2/renderer/Renderer9.h
+++ b/src/libGLESv2/renderer/Renderer9.h
@@ -33,7 +33,7 @@
{
class D3DConstantTable;
class VertexDataManager;
-class StreamingIndexBuffer;
+class StreamingIndexBufferInterface;
struct TranslatedAttribute;
class Renderer9 : public Renderer
@@ -283,7 +283,7 @@
VertexDeclarationCache mVertexDeclarationCache;
IndexDataManager *mIndexDataManager;
- StreamingIndexBuffer *mLineLoopIB;
+ StreamingIndexBufferInterface *mLineLoopIB;
enum { NUM_NULL_COLORBUFFER_CACHE_ENTRIES = 12 };
struct NullColorbufferCacheEntry
