commit 621ce053c1a3048c2357b8b070ca934ef5e3dabf
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 17:52:29 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 17:52:29 2012 +0000
tree da3a7f27b2831791aa61ca8e7bc7fd37762624f8
parent 71621a8830c8fdd0dee2464b2b15330228115429

Add Renderer class and move functionality from Display

Trac #21727

Conflicts:

	src/libGLESv2/Texture.cpp
	src/libGLESv2/libGLESv2.vcxproj

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1329 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/VertexDataManager.cpp

diff --git a/src/libGLESv2/VertexDataManager.cpp b/src/libGLESv2/VertexDataManager.cpp
index 32c4018..ad747d3 100644
--- a/src/libGLESv2/VertexDataManager.cpp
+++ b/src/libGLESv2/VertexDataManager.cpp
@@ -45,6 +45,7 @@
         mCurrentValueOffsets[i] = 0;
     }
 
+    // D3D9_REPLACE
     const D3DCAPS9 &caps = context->getDeviceCaps();
     checkVertexCaps(caps.DeclTypes);
 
@@ -575,7 +576,8 @@
 {
     if (size > 0)
     {
-        D3DPOOL pool = getDisplay()->getBufferPool(usageFlags);
+        // D3D9_REPLACE
+        D3DPOOL pool = getDisplay()->getRenderer()->getBufferPool(usageFlags);
         HRESULT result = device->CreateVertexBuffer(size, usageFlags, 0, pool, &mVertexBuffer, NULL);
         mSerial = issueSerial();
         
@@ -674,7 +676,8 @@
 
         mBufferSize = std::max(mRequiredSpace, 3 * mBufferSize / 2);   // 1.5 x mBufferSize is arbitrary and should be checked to see we don't have too many reallocations.
 
-        D3DPOOL pool = getDisplay()->getBufferPool(D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY);
+        // D3D9_REPLACE
+        D3DPOOL pool = getDisplay()->getRenderer()->getBufferPool(D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY);
         HRESULT result = mDevice->CreateVertexBuffer(mBufferSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, pool, &mVertexBuffer, NULL);
         mSerial = issueSerial();
     
@@ -737,7 +740,8 @@
 {
     if (!mVertexBuffer && mBufferSize == 0)
     {
-        D3DPOOL pool = getDisplay()->getBufferPool(D3DUSAGE_WRITEONLY);
+        // D3D9_REPLACE
+        D3DPOOL pool = getDisplay()->getRenderer()->getBufferPool(D3DUSAGE_WRITEONLY);
         HRESULT result = mDevice->CreateVertexBuffer(mRequiredSpace, D3DUSAGE_WRITEONLY, 0, pool, &mVertexBuffer, NULL);
         mSerial = issueSerial();