commit 183408d0c4fdaa702329c5a386e09129aa8b2bb2
author shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 25 21:50:07 2013 +0000
committer shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 25 21:50:07 2013 +0000
tree fee87618bee61ae00c02fe0ac99a3a28e0e39ee4
parent 858d32fa8bc0298a7d78954f5340d5019d718d11

RenderTarget11 now stores a shader resource.

TRAC #22358

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1744 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 412f6c1..d215e4b 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -1687,15 +1687,18 @@
 
 RenderTarget *Renderer11::createRenderTarget(SwapChain *swapChain, bool depth)
 {
-    SwapChain11 *swapChain11 = SwapChain11::makeSwapChain11(swapChain); 
+    SwapChain11 *swapChain11 = SwapChain11::makeSwapChain11(swapChain);
     RenderTarget11 *renderTarget = NULL;
     if (depth)
     {
-        renderTarget = new RenderTarget11(this, swapChain11->getDepthStencil(), swapChain11->getWidth(), swapChain11->getHeight());
+        renderTarget = new RenderTarget11(this, swapChain11->getDepthStencil(), NULL,
+                                          swapChain11->getWidth(), swapChain11->getHeight());
     }
     else
     {
-        renderTarget = new RenderTarget11(this, swapChain11->getRenderTarget(), swapChain11->getWidth(), swapChain11->getHeight());
+        renderTarget = new RenderTarget11(this, swapChain11->getRenderTarget(),
+                                          swapChain11->getRenderTargetShaderResource(),
+                                          swapChain11->getWidth(), swapChain11->getHeight());
     }
     return renderTarget;
 }