Patch fixes that should have made it into prior patch for renderable migration.

TRAC #22211 Author: Shannon Woods git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1654 736b8ea6-26fd-11df-bfd4-992fa37f6226

Patch fixes that should have made it into prior patch for renderable migration.
e9cf5e74 · daniel@transgaming.com · b1c208f9 · e9cf5e74
Commit e9cf5e74 authored Jan 11, 2013 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Renderer11.cpp src/libGLESv2/renderer/Renderer11.cpp +4 -4

No files found.
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -1303,7 +1303,7 @@ bool Renderer11::copyToRenderTarget(TextureStorageInterface2D *dest, TextureStor
        TextureStorage11_2D *source11 = TextureStorage11_2D::makeTextureStorage11_2D(source->getStorageInstance());
        TextureStorage11_2D *dest11 = TextureStorage11_2D::makeTextureStorage11_2D(dest->getStorageInstance());
-        getDeviceContext()->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+        mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
        return true;
    }
@@ -1314,10 +1314,10 @@ bool Renderer11::copyToRenderTarget(TextureStorageInterfaceCube *dest, TextureSt
 {
    if (source && dest)
    {
-        TextureStorage11_2D *source11 = TextureStorage11_2D::makeTextureStorage11_2D(source->getStorageInstance());
+        TextureStorage11_Cube *source11 = TextureStorage11_Cube::makeTextureStorage11_Cube(source->getStorageInstance());
-        TextureStorage11_2D *dest11 = TextureStorage11_2D::makeTextureStorage11_2D(dest->getStorageInstance());
+        TextureStorage11_Cube *dest11 = TextureStorage11_Cube::makeTextureStorage11_Cube(dest->getStorageInstance());
-        getDeviceContext()->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
+        mDeviceContext->CopyResource(dest11->getBaseTexture(), source11->getBaseTexture());
        return true;
    }