commit ea32d48b64ab98a881c432409b27db9773e7cc7c
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:33:18 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:33:18 2012 +0000
tree cf4064955c21e333c9516f17df6a92a0abaea745
parent a9571686400fef2fe0400336a963cfb44deca33f

Removes getDisplay and getContext calls

TRAC #22000

Signed-off-by: Daniel Koch

Author:    Shannon Woods

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

src/libGLESv2/renderer/Image.cpp

diff --git a/src/libGLESv2/renderer/Image.cpp b/src/libGLESv2/renderer/Image.cpp
index 716d4cb..f3ffba4 100644
--- a/src/libGLESv2/renderer/Image.cpp
+++ b/src/libGLESv2/renderer/Image.cpp
@@ -210,6 +210,8 @@
 
     mDirty = false;
 
+    mRenderer = NULL;
+
     mD3DPool = D3DPOOL_SYSTEMMEM;
     mD3DFormat = D3DFMT_UNKNOWN;
     mActualFormat = GL_NONE;
@@ -277,6 +279,9 @@
         mD3DFormat = renderer->ConvertTextureInternalFormat(internalformat);
         mActualFormat = dx2es::GetEquivalentFormat(mD3DFormat);
 
+        ASSERT(dynamic_cast<rx::Renderer9*>(renderer) != NULL); // D3D9_REPLACE
+        mRenderer = static_cast<rx::Renderer9*>(renderer); // D3D9_REPLACE
+
         if (mSurface)
         {
             mSurface->Release();
@@ -309,8 +314,8 @@
         GLsizei requestHeight = mHeight;
         MakeValidSize(true, IsCompressed(mInternalFormat), &requestWidth, &requestHeight, &levelToFetch);
 
-        // D3D9_REPLACE
-        IDirect3DDevice9 *device = getDisplay()->getRenderer9()->getDevice();
+        IDirect3DDevice9 *device = mRenderer->getDevice(); // D3D9_REPLACE
+
         HRESULT result = device->CreateTexture(requestWidth, requestHeight, levelToFetch + 1, NULL, d3dFormat,
                                                     poolToUse, &newTexture, NULL);
 
@@ -437,7 +442,8 @@
         rect.bottom = yoffset + height;
 
         POINT point = {rect.left, rect.top};
-        IDirect3DDevice9 *device = getDisplay()->getRenderer9()->getDevice();  // D3D9_REPLACE
+
+        IDirect3DDevice9 *device = mRenderer->getDevice(); // D3D9_REPLACE
 
         if (mD3DPool == D3DPOOL_MANAGED)
         {
@@ -986,7 +992,8 @@
         return error(GL_OUT_OF_MEMORY);
     }
 
-    IDirect3DDevice9 *device = getDisplay()->getRenderer9()->getDevice(); // D3D9_REPLACE
+    IDirect3DDevice9 *device = mRenderer->getDevice(); // D3D9_REPLACE
+
     IDirect3DSurface9 *renderTargetData = NULL;
     D3DSURFACE_DESC description;
     renderTarget->GetDesc(&description);