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/Blit.cpp

diff --git a/src/libGLESv2/Blit.cpp b/src/libGLESv2/Blit.cpp
index 28f3fbf..60af126 100644
--- a/src/libGLESv2/Blit.cpp
+++ b/src/libGLESv2/Blit.cpp
@@ -64,6 +64,7 @@
     }
 }
 
+// D3D9_REPLACE
 void Blit::initGeometry()
 {
     static const float quad[] =
@@ -117,7 +118,7 @@
                      HRESULT (WINAPI IDirect3DDevice9::*setShader)(D3DShaderType*))
 {
     egl::Display *display = getDisplay();
-    IDirect3DDevice9 *device = display->getDevice();
+    IDirect3DDevice9 *device = display->getRenderer()->getDevice(); // D3D9_REPLACE
 
     D3DShaderType *shader;
 
@@ -183,6 +184,7 @@
         return false;
     }
 
+    // D3D9_REPLACE
     IDirect3DDevice9 *device = getDevice();
 
     saveState();
@@ -210,6 +212,7 @@
 
 bool Blit::copy(IDirect3DSurface9 *source, const RECT &sourceRect, GLenum destFormat, GLint xoffset, GLint yoffset, IDirect3DSurface9 *dest)
 {
+    // D3D9_REPLACE
     IDirect3DDevice9 *device = getDevice();
 
     D3DSURFACE_DESC sourceDesc;
@@ -245,6 +248,7 @@
         return false;
     }
 
+    // D3D9_REPLACE
     IDirect3DDevice9 *device = getDevice();
 
     saveState();
@@ -330,6 +334,7 @@
     return true;
 }
 
+// D3D9_REPLACE
 IDirect3DTexture9 *Blit::copySurfaceToTexture(IDirect3DSurface9 *surface, const RECT &sourceRect)
 {
     if (!surface)
@@ -338,7 +343,8 @@
     }
 
     egl::Display *display = getDisplay();
-    IDirect3DDevice9 *device = getDevice();
+    renderer::Renderer *renderer = display->getRenderer();
+    IDirect3DDevice9 *device = renderer->getDevice(); // D3D9_REPLACE
 
     D3DSURFACE_DESC sourceDesc;
     surface->GetDesc(&sourceDesc);
@@ -363,7 +369,7 @@
         return error(GL_OUT_OF_MEMORY, (IDirect3DTexture9*)NULL);
     }
 
-    display->endScene();
+    renderer->endScene();
     result = device->StretchRect(surface, &sourceRect, textureSurface, NULL, D3DTEXF_NONE);
 
     textureSurface->Release();
@@ -380,7 +386,7 @@
 
 void Blit::setViewport(const RECT &sourceRect, GLint xoffset, GLint yoffset)
 {
-    IDirect3DDevice9 *device = getDevice();
+    IDirect3DDevice9 *device = getDevice(); // D3D9_REPLACE
 
     D3DVIEWPORT9 vp;
     vp.X      = xoffset;
@@ -395,6 +401,7 @@
     device->SetVertexShaderConstantF(0, halfPixelAdjust, 1);
 }
 
+// D3D9_REPLACE
 void Blit::setCommonBlitState()
 {
     IDirect3DDevice9 *device = getDevice();
@@ -425,18 +432,21 @@
     }
 }
 
+// D3D9_REPLACE
 void Blit::render()
 {
     egl::Display *display = getDisplay();
-    IDirect3DDevice9 *device = getDevice();
+    renderer::Renderer *renderer = display->getRenderer();
+    IDirect3DDevice9 *device = renderer->getDevice();
 
     HRESULT hr = device->SetStreamSource(0, mQuadVertexBuffer, 0, 2 * sizeof(float));
     hr = device->SetVertexDeclaration(mQuadVertexDeclaration);
 
-    display->startScene();
+    renderer->startScene();
     hr = device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
 }
 
+// D3D9_REPLACE
 void Blit::saveState()
 {
     IDirect3DDevice9 *device = getDevice();
@@ -489,6 +499,7 @@
     }
 }
 
+// D3D9_REPLACE
 void Blit::restoreState()
 {
     IDirect3DDevice9 *device = getDevice();