Skip to content

A
angle
Commit b2d298db by Jamie Madill
Options

Fix TextureStorage11::setData for 3D textures.

Currently this method doesn't handle partial offsets. Fixes dEQP tests in the texture specification group. BUG=angle:899 Change-Id: I20160e49a46957b4f6cf96f529ab4ea7ddf7b343 Reviewed-on: https://chromium-review.googlesource.com/244091Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 37997145
Showing with 4 additions and 3 deletions
src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
...@@ -535,7 +535,8 @@ gl::Error TextureStorage11::setData(const gl::ImageIndex &index, ImageD3D *image ...@@ -535,7 +535,8 @@ gl::Error TextureStorage11::setData(const gl::ImageIndex &index, ImageD3D *image
const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(image->getInternalFormat()); const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(image->getInternalFormat());
bool fullUpdate = (destBox == NULL || *destBox == gl::Box(0, 0, 0, mTextureWidth, mTextureHeight, mTextureDepth)); gl::Box levelBox(0, 0, 0, getLevelWidth(index.mipIndex), getLevelHeight(index.mipIndex), getLevelDepth(index.mipIndex));
bool fullUpdate = (destBox == NULL || *destBox == levelBox);
ASSERT(internalFormatInfo.depthBits == 0 || fullUpdate); ASSERT(internalFormatInfo.depthBits == 0 || fullUpdate);
// TODO(jmadill): Handle compressed formats // TODO(jmadill): Handle compressed formats
...@@ -583,8 +584,8 @@ gl::Error TextureStorage11::setData(const gl::ImageIndex &index, ImageD3D *image ...@@ -583,8 +584,8 @@ gl::Error TextureStorage11::setData(const gl::ImageIndex &index, ImageD3D *image
destD3DBox.right = destBox->x + destBox->width; destD3DBox.right = destBox->x + destBox->width;
destD3DBox.top = destBox->y; destD3DBox.top = destBox->y;
destD3DBox.bottom = destBox->y + destBox->height; destD3DBox.bottom = destBox->y + destBox->height;
destD3DBox.front = 0; destD3DBox.front = destBox->z;
destD3DBox.back = 1; destD3DBox.back = destBox->z + destBox->depth;
immediateContext->UpdateSubresource(resource, destSubresource, immediateContext->UpdateSubresource(resource, destSubresource,
&destD3DBox, conversionBuffer->data(), &destD3DBox, conversionBuffer->data(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment