gfx/angle/angle-tex-pool-default.patch@deefc01c0e14 (annotated)
gfx/angle/angle-tex-pool-default.patch
Thu, 15 Jan 2015 21:03:48 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 21:03:48 +0100
- branch
- TOR_BUG_9701
- changeset 11
- deefc01c0e14
- permissions
- -rw-r--r--
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
| 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 | { |
