commit fa35bc266e476b3b1f44462c4229609adf448b1b
author Torne (Richard Coles) <torne@google.com> Tue Feb 03 10:52:56 2015 +0000
committer Torne (Richard Coles) <torne@google.com> Tue Feb 03 10:52:56 2015 +0000
tree 4eb1d2d9af7f2cafce73f631670e2f4ea0a1138b
parent 55f0c03fac9708db6a56a6402cc4c0af3ad4f2de
parent 3fd356e8a9e158b92f5178f5a174d99cef9555a0

Merge from Chromium at DEPS revision 40.0.2214.107

This commit was generated by merge_to_master.py.

Change-Id: I9a0c54346a03a1dae0c4edfe75f40d45423aa79d

src/libGLESv2/renderer/d3d/TextureD3D.cpp

diff --git a/src/libGLESv2/renderer/d3d/TextureD3D.cpp b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
index bdea186..77e00f7 100644
--- a/src/libGLESv2/renderer/d3d/TextureD3D.cpp
+++ b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
@@ -1423,7 +1423,7 @@
 
 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)