commit 27ac40e8d6e580bfd2c70ccc06cc2ac84cc017b7
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:43:17 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:43:17 2013 +0000
tree a23d35fb7a7bf1a474f19a5fdb4f9f800cb19376
parent 5d009bb92f5a73130057bab196e171edb7a6792f

RenderTarget11 now stores a Resource instead of a Texture2D.

TRAC #22705

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

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2163 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 c0cc532..f86912b 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -3503,16 +3503,21 @@
         return gl::error(GL_OUT_OF_MEMORY, false);
     }
 
-    ID3D11Texture2D *readTexture = NULL;
+    ID3D11Resource *readTexture = NULL;
     unsigned int readSubresource = 0;
     if (readRenderTarget->getSamples() > 0)
     {
-        ID3D11Texture2D *unresolvedTexture = readRenderTarget11->getTexture();
+        ID3D11Resource *unresolvedResource = readRenderTarget11->getTexture();
+        ID3D11Texture2D *unresolvedTexture = d3d11::DynamicCastComObject<ID3D11Texture2D>(unresolvedResource);
+        unresolvedResource->Release();
 
-        readTexture = resolveMultisampledTexture(unresolvedTexture, readRenderTarget11->getSubresourceIndex());
-        readSubresource = 0;
+        if (unresolvedTexture)
+        {
+            readTexture = resolveMultisampledTexture(unresolvedTexture, readRenderTarget11->getSubresourceIndex());
+            readSubresource = 0;
 
-        unresolvedTexture->Release();
+            unresolvedTexture->Release();
+        }
     }
     else
     {
@@ -3534,7 +3539,7 @@
         return gl::error(GL_OUT_OF_MEMORY, false);
     }
 
-    ID3D11Texture2D *drawTexture = drawRenderTarget11->getTexture();
+    ID3D11Resource *drawTexture = drawRenderTarget11->getTexture();
     unsigned int drawSubresource = drawRenderTarget11->getSubresourceIndex();
 
     D3D11_BOX readBox;