commit e4e45066ba9d573d05d883ecbec478b81606af67
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:56:53 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:56:53 2012 +0000
tree f24b185ec1015471640163f7f72392a6042f4f1f
parent 593ebc41998cc2bf9dbea20b7a455d207845e438

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

src/libGLESv2/renderer/VertexDataManager.cpp

diff --git a/src/libGLESv2/renderer/VertexDataManager.cpp b/src/libGLESv2/renderer/VertexDataManager.cpp
index 769749f..f08ed64 100644
--- a/src/libGLESv2/renderer/VertexDataManager.cpp
+++ b/src/libGLESv2/renderer/VertexDataManager.cpp
@@ -52,7 +52,7 @@
     // 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 @@
     }
 }
 
-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 @@
         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 @@
                         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 @@
         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 @@
 
                 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 @@
             {
                 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] ||