gfx/angle/angle-tex-pool-default.patch

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

michael@0 1 From: Jeff Gilbert <jgilbert@mozilla.com>
michael@0 2
michael@0 3 diff --git a/gfx/angle/src/libGLESv2/renderer/Renderer9.cpp b/gfx/angle/src/libGLESv2/renderer/Renderer9.cpp
michael@0 4 --- a/gfx/angle/src/libGLESv2/renderer/Renderer9.cpp
michael@0 5 +++ b/gfx/angle/src/libGLESv2/renderer/Renderer9.cpp
michael@0 6 @@ -3128,17 +3128,17 @@ D3DPOOL Renderer9::getTexturePool(DWORD
michael@0 7 if (mD3d9Ex != NULL)
michael@0 8 {
michael@0 9 return D3DPOOL_DEFAULT;
michael@0 10 }
michael@0 11 else
michael@0 12 {
michael@0 13 if (!(usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)))
michael@0 14 {
michael@0 15 - return D3DPOOL_MANAGED;
michael@0 16 + return D3DPOOL_DEFAULT;
michael@0 17 }
michael@0 18 }
michael@0 19
michael@0 20 return D3DPOOL_DEFAULT;
michael@0 21 }
michael@0 22
michael@0 23 bool Renderer9::copyToRenderTarget(IDirect3DSurface9 *dest, IDirect3DSurface9 *source, bool fromManaged)
michael@0 24 {

mercurial