Commit 604359b9 by Jamie Madill Committed by Commit Bot

D3D11/ES31: Fix unimplemented multitexture errors.

Although the functionality for these textures is unimplemented, we still create zero textures for multisample in D3D11. Thus the constructor and destructor should be marked as implemented. BUG=angleproject:1590 BUG=angleproject:1660 Change-Id: I44b51dd4e89d492f98c134b8f7dfd62dffc97015 Reviewed-on: https://chromium-review.googlesource.com/437304Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent f6d14799
...@@ -587,12 +587,10 @@ TextureD3D_2DMultisample::TextureD3D_2DMultisample(const gl::TextureState &state ...@@ -587,12 +587,10 @@ TextureD3D_2DMultisample::TextureD3D_2DMultisample(const gl::TextureState &state
RendererD3D *renderer) RendererD3D *renderer)
: TextureD3D(state, renderer) : TextureD3D(state, renderer)
{ {
UNIMPLEMENTED();
} }
TextureD3D_2DMultisample::~TextureD3D_2DMultisample() TextureD3D_2DMultisample::~TextureD3D_2DMultisample()
{ {
UNIMPLEMENTED();
} }
ImageD3D *TextureD3D_2DMultisample::getImage(const gl::ImageIndex &index) const ImageD3D *TextureD3D_2DMultisample::getImage(const gl::ImageIndex &index) const
...@@ -782,7 +780,7 @@ TextureD3D_2D::~TextureD3D_2D() ...@@ -782,7 +780,7 @@ TextureD3D_2D::~TextureD3D_2D()
// If TextureStorage is deleted before the Images, then their data will be wastefully copied back from the GPU before we delete the Images. // If TextureStorage is deleted before the Images, then their data will be wastefully copied back from the GPU before we delete the Images.
for (int i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; ++i) for (int i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; ++i)
{ {
delete mImageArray[i]; SafeDelete(mImageArray[i]);
} }
SafeDelete(mTexStorage); SafeDelete(mTexStorage);
......
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