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.)

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

mercurial