diff options
| author | Torne (Richard Coles) <torne@google.com> | 2015-02-03 10:52:56 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2015-02-03 10:52:56 +0000 |
| commit | fa35bc266e476b3b1f44462c4229609adf448b1b (patch) | |
| tree | 4eb1d2d9af7f2cafce73f631670e2f4ea0a1138b | |
| parent | 55f0c03fac9708db6a56a6402cc4c0af3ad4f2de (diff) | |
| parent | 3fd356e8a9e158b92f5178f5a174d99cef9555a0 (diff) | |
| download | angle-fa35bc266e476b3b1f44462c4229609adf448b1b.tar.gz | |
Merge from Chromium at DEPS revision 40.0.2214.107webview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-release
This commit was generated by merge_to_master.py.
Change-Id: I9a0c54346a03a1dae0c4edfe75f40d45423aa79d
| -rw-r--r-- | src/libGLESv2/renderer/d3d/TextureD3D.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libGLESv2/renderer/d3d/TextureD3D.cpp b/src/libGLESv2/renderer/d3d/TextureD3D.cpp index bdea186a..77e00f79 100644 --- a/src/libGLESv2/renderer/d3d/TextureD3D.cpp +++ b/src/libGLESv2/renderer/d3d/TextureD3D.cpp @@ -1423,7 +1423,7 @@ void TextureD3D_Cube::initMipmapsImages() unsigned int TextureD3D_Cube::getRenderTargetSerial(const gl::ImageIndex &index) { - return (ensureRenderTarget().isError() ? mTexStorage->getRenderTargetSerial(index) : 0); + return (!ensureRenderTarget().isError() ? mTexStorage->getRenderTargetSerial(index) : 0); } gl::Error TextureD3D_Cube::getRenderTarget(const gl::ImageIndex &index, RenderTarget **outRT) |