diff options
| author | Torne (Richard Coles) <torne@google.com> | 2015-02-03 10:34:49 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2015-02-03 10:34:49 +0000 |
| commit | 3fd356e8a9e158b92f5178f5a174d99cef9555a0 (patch) | |
| tree | 4eb1d2d9af7f2cafce73f631670e2f4ea0a1138b | |
| parent | b523b79b45a72fb933b4fd0fcd81fe570de778c8 (diff) | |
| parent | d77bd1632e4c3bbe326be4fb32fe6c53187cd5dd (diff) | |
| download | angle-3fd356e8a9e158b92f5178f5a174d99cef9555a0.tar.gz | |
Merge third_party/angle from https://chromium.googlesource.com/angle/angle.git at d77bd1632e4c3bbe326be4fb32fe6c53187cd5dd
This commit was generated by merge_from_chromium.py.
Change-Id: Ia1aa47601f2582964d7e65e4cc2750eda9f88200
| -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) |