commit 7e23285f51e48e8f3d75c99a1451023543fb4c66
author shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:06:15 2013 +0000
committer shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:06:15 2013 +0000
tree bf134ca7c8848d8c633a3de30d49140d096f62cb
parent d67f9ce00a1ff8289f330bb8ca9233fe38a48be2

Added a texture object to RenderTarget11.

TRAC #22416

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

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

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index b63d361..12e5627 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -2568,12 +2568,14 @@
     RenderTarget11 *renderTarget = NULL;
     if (depth)
     {
-        renderTarget = new RenderTarget11(this, swapChain11->getDepthStencil(), NULL,
+        renderTarget = new RenderTarget11(this, swapChain11->getDepthStencil(),
+                                          swapChain11->getDepthStencilTexture(), NULL,
                                           swapChain11->getWidth(), swapChain11->getHeight());
     }
     else
     {
         renderTarget = new RenderTarget11(this, swapChain11->getRenderTarget(),
+                                          swapChain11->getOffscreenTexture(),
                                           swapChain11->getRenderTargetShaderResource(),
                                           swapChain11->getWidth(), swapChain11->getHeight());
     }