commit c5c806d3289d8f6b6484157b8d8f0d64390111f1
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:52:53 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:52:53 2012 +0000
tree 267ee55d1d20889f640dabca9be5026bfb25dbbb
parent 244e1838a3d475c26e6bc1830aab5e87f8bf8c48

Passes a base-class Renderer pointer to Image where needed, instead of Renderer9

TRAC #22254

Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1570 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 e263a7a..428c0c5 100644
--- a/src/libGLESv2/renderer/Image.cpp
+++ b/src/libGLESv2/renderer/Image.cpp
@@ -266,22 +266,22 @@
     else UNREACHABLE();
 }
 
-bool Image::redefine(rx::Renderer9 *renderer, GLint internalformat, GLsizei width, GLsizei height, bool forceRelease)
+bool Image::redefine(rx::Renderer *renderer, GLint internalformat, GLsizei width, GLsizei height, bool forceRelease)
 {
     if (mWidth != width ||
         mHeight != height ||
         mInternalFormat != internalformat ||
         forceRelease)
     {
+        mRenderer = Renderer9::makeRenderer9(renderer);
+
         mWidth = width;
         mHeight = height;
         mInternalFormat = internalformat;
         // compute the d3d format that will be used
-        mD3DFormat = renderer->ConvertTextureInternalFormat(internalformat);
+        mD3DFormat = mRenderer->ConvertTextureInternalFormat(internalformat);
         mActualFormat = d3d9_gl::GetEquivalentFormat(mD3DFormat);
 
-        mRenderer = Renderer9::makeRenderer9(renderer); // D3D9_REPLACE
-
         if (mSurface)
         {
             mSurface->Release();