Fix D3D11 depth/stencil framebuffer blit.

D3D11 requires the pSrcBox parameter to be NULL for depth/stencil CopySubresourceRegion calls. TRAC #22679 Signed-off-by: Geoff Lang Signed-off-by: Shannon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@2029 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix D3D11 depth/stencil framebuffer blit.
0f05d80f · shannon.woods%transgaming.com@gtempaccount.com · 25c18808 · 0f05d80f · 0f05d80f
Commit 0f05d80f authored Mar 23, 2013 by shannon.woods%transgaming.com@gtempaccount.com
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

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

Renderer11.h src/libGLESv2/renderer/Renderer11.h +2 -1

No files found.
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -2945,7 +2945,7 @@ bool Renderer11::blitRect(gl::Framebuffer *readTarget, const gl::Rectangle &read

                RenderTarget *drawRenderTarget = drawBuffer->getRenderTarget();

-                if (!blitRenderbufferRect(readRect, drawRect, readRenderTarget, drawRenderTarget))
+                if (!blitRenderbufferRect(readRect, drawRect, readRenderTarget, drawRenderTarget, false))
                {
                    return false;
                }
@@ -2973,7 +2973,7 @@ bool Renderer11::blitRect(gl::Framebuffer *readTarget, const gl::Rectangle &read
        RenderTarget *readRenderTarget = readBuffer->getDepthStencil();
        RenderTarget *drawRenderTarget = drawBuffer->getDepthStencil();

-        if (!blitRenderbufferRect(readRect, drawRect, readRenderTarget, drawRenderTarget))
+        if (!blitRenderbufferRect(readRect, drawRect, readRenderTarget, drawRenderTarget, true))
        {
            return false;
        }
@@ -3404,7 +3404,8 @@ void Renderer11::readTextureData(ID3D11Texture2D *texture, unsigned int subResou
    stagingTex = NULL;
 }

-bool Renderer11::blitRenderbufferRect(const gl::Rectangle &readRect, const gl::Rectangle &drawRect, RenderTarget *readRenderTarget, RenderTarget *drawRenderTarget)
+bool Renderer11::blitRenderbufferRect(const gl::Rectangle &readRect, const gl::Rectangle &drawRect, RenderTarget *readRenderTarget, 
+                                      RenderTarget *drawRenderTarget, bool wholeBufferCopy)
 {
    ASSERT(readRect.width == drawRect.width && readRect.height == drawRect.height);

@@ -3457,8 +3458,12 @@ bool Renderer11::blitRenderbufferRect(const gl::Rectangle &readRect, const gl::R
    readBox.front = 0;
    readBox.back = 1;

+    // D3D11 needs depth-stencil CopySubresourceRegions to have a NULL pSrcBox
+    // We also require complete framebuffer copies for depth-stencil blit.
+    D3D11_BOX *pSrcBox = wholeBufferCopy ? NULL : &readBox;
+
    mDeviceContext->CopySubresourceRegion(drawTexture, drawSubresource, drawRect.x, drawRect.y, 0,
-                                          readTexture, readSubresource, &readBox);
+                                          readTexture, readSubresource, pSrcBox);

    readTexture->Release();
    drawTexture->Release();

--- a/src/libGLESv2/renderer/Renderer11.h
+++ b/src/libGLESv2/renderer/Renderer11.h
@@ -195,7 +195,8 @@ class Renderer11 : public Renderer
    void maskedClear(const gl::ClearParameters &clearParams);
    rx::Range getViewportBounds() const;

-    bool blitRenderbufferRect(const gl::Rectangle &readRect, const gl::Rectangle &drawRect, RenderTarget *readRenderTarget, RenderTarget *drawRenderTarget);
+    bool blitRenderbufferRect(const gl::Rectangle &readRect, const gl::Rectangle &drawRect, RenderTarget *readRenderTarget, 
+                              RenderTarget *drawRenderTarget, bool wholeBufferCopy);
    ID3D11Texture2D *resolveMultisampledTexture(ID3D11Texture2D *source, unsigned int subresource);

    HMODULE mD3d11Module;