commit 3fd356e8a9e158b92f5178f5a174d99cef9555a0
author Torne (Richard Coles) <torne@google.com> Tue Feb 03 10:34:49 2015 +0000
committer Torne (Richard Coles) <torne@google.com> Tue Feb 03 10:34:49 2015 +0000
tree 4eb1d2d9af7f2cafce73f631670e2f4ea0a1138b
parent b523b79b45a72fb933b4fd0fcd81fe570de778c8
parent d77bd1632e4c3bbe326be4fb32fe6c53187cd5dd

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

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)