commit 204677af271502bb1f91d4abd0cf8ab4ab5b49d0
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 11 21:16:09 2013 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 11 21:16:09 2013 +0000
tree ba567d30a3ec556a6652f49be4e072a5938dbecc
parent ed36abd83e40bb1c0f4af9ea7314906b86ea3cdd

Cleanup extraneous D3D9_REPLACE comments

Trac #22394
Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods

Blit.cpp and Renderer9.h/.cpp will remain d3d9-specific.
Remove various unused includes and a typedef.

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

src/libGLESv2/renderer/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index f60c992..555010f 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -596,7 +596,6 @@
     }
 }
 
-// D3D9_REPLACE
 void Renderer9::sync(bool block)
 {
     HRESULT result;
@@ -642,7 +641,6 @@
     return new rx::SwapChain9(this, window, shareHandle, backBufferFormat, depthBufferFormat);
 }
 
-// D3D9_REPLACE
 IDirect3DQuery9* Renderer9::allocateEventQuery()
 {
     IDirect3DQuery9 *query = NULL;
@@ -661,7 +659,6 @@
     return query;
 }
 
-// D3D9_REPLACE
 void Renderer9::freeEventQuery(IDirect3DQuery9* query)
 {
     if (mEventQueryPool.size() > 1000)
@@ -2252,7 +2249,6 @@
 bool Renderer9::getShareHandleSupport() const
 {
     // PIX doesn't seem to support using share handles, so disable them.
-    // D3D9_REPLACE
     return (mD3d9Ex != NULL) && !gl::perfActive();
 }
 
@@ -3029,7 +3025,6 @@
     if (source && dest)
     {
         HRESULT result = D3DERR_OUTOFVIDEOMEMORY;
-        IDirect3DDevice9 *device = getDevice(); // D3D9_REPLACE
 
         if (fromManaged)
         {
@@ -3037,19 +3032,19 @@
             source->GetDesc(&desc);
 
             IDirect3DSurface9 *surf = 0;
-            result = device->CreateOffscreenPlainSurface(desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &surf, NULL);
+            result = mDevice->CreateOffscreenPlainSurface(desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &surf, NULL);
 
             if (SUCCEEDED(result))
             {
                 Image9::copyLockableSurfaces(surf, source);
-                result = device->UpdateSurface(surf, NULL, dest, NULL);
+                result = mDevice->UpdateSurface(surf, NULL, dest, NULL);
                 surf->Release();
             }
         }
         else
         {
             endScene();
-            result = device->StretchRect(source, NULL, dest, NULL, D3DTEXF_NONE);
+            result = mDevice->StretchRect(source, NULL, dest, NULL, D3DTEXF_NONE);
         }
 
         if (FAILED(result))