Use mTopLevel in getSubresourceIndex.

We need to include this in every call, so might as well handle it automatically. BUG=angle:729 Change-Id: I5c230408a9eb80c8cfcc3f0d3a4ea531fa173aed Reviewed-on: https://chromium-review.googlesource.com/221760Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Use mTopLevel in getSubresourceIndex.
c8d13843 · Jamie Madill · 1ea53509 · c8d13843
Commit c8d13843 authored Oct 06, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

TextureStorage11.cpp src/libGLESv2/renderer/d3d/d3d11/TextureStorage11.cpp +3 -3

No files found.
--- a/src/libGLESv2/renderer/d3d/d3d11/TextureStorage11.cpp
+++ b/src/libGLESv2/renderer/d3d/d3d11/TextureStorage11.cpp
@@ -189,7 +189,7 @@ UINT TextureStorage11::getSubresourceIndex(int mipLevel, int layerTarget) const
    UINT index = 0;
    if (getResource())
    {
-        index = D3D11CalcSubresource(mipLevel, layerTarget, mMipLevels);
+        index = D3D11CalcSubresource(mipLevel + mTopLevel, layerTarget, mMipLevels);
    }
    return index;
 }
@@ -307,7 +307,7 @@ gl::Error TextureStorage11::updateSubresourceLevel(ID3D11Resource *srcTexture, u
                    copyArea.depth  == texSize.depth;

    ID3D11Resource *dstTexture = getResource();
-    unsigned int dstSubresource = getSubresourceIndex(level + mTopLevel, layerTarget);
+    unsigned int dstSubresource = getSubresourceIndex(level, layerTarget);

    ASSERT(dstTexture);

@@ -348,7 +348,7 @@ bool TextureStorage11::copySubresourceLevel(ID3D11Resource* dstTexture, unsigned
    if (dstTexture)
    {
        ID3D11Resource *srcTexture = getResource();
-        unsigned int srcSubresource = getSubresourceIndex(level + mTopLevel, layerTarget);
+        unsigned int srcSubresource = getSubresourceIndex(level, layerTarget);

        ASSERT(srcTexture);