commit d463bad82114ae420b165f8c3f2a690b9d663a19 Author: Jacek Caban jacek@codeweavers.com Date: Thu Jun 22 17:33:39 2017 +0200
Bug 1372870 - Compiling with mingw-w64 based on GCC 6.3.0 breaks (operands to ?: have different types) r=mattwoodrow --- gfx/layers/d3d11/TextureD3D11.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gfx/layers/d3d11/TextureD3D11.h b/gfx/layers/d3d11/TextureD3D11.h index 831342aa2e0b..bd0fbf659777 100644 --- a/gfx/layers/d3d11/TextureD3D11.h +++ b/gfx/layers/d3d11/TextureD3D11.h @@ -237,7 +237,7 @@ public: virtual ID3D11ShaderResourceView* GetShaderResourceView() override;
// Returns nullptr if this texture was created by a DXGI TextureHost. - virtual DataTextureSource* AsDataTextureSource() override { return mAllowTextureUploads ? this : false; } + virtual DataTextureSource* AsDataTextureSource() override { return mAllowTextureUploads ? this : nullptr; }
virtual void DeallocateDeviceData() override { mTexture = nullptr; }