author | Nicolas Silva <nical@mozilla.com> |
Tue, 08 Apr 2014 15:17:26 +0200 | |
changeset 177567 | 2b61df0983d60ea336389200a3b27eddd48bd8ed |
parent 177566 | 6b1ca7b19fb7c43c91848faec41662077993a272 |
child 177568 | 568c9573340af6ebb129a1563b5a5662147c1ea8 |
push id | 26556 |
push user | ryanvm@gmail.com |
push date | Tue, 08 Apr 2014 22:16:57 +0000 |
treeherder | mozilla-central@5811efc11011 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mattwoodrow |
bugs | 993360 |
milestone | 31.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
gfx/layers/d3d11/TextureD3D11.cpp | file | annotate | diff | comparison | revisions | |
gfx/layers/d3d9/TextureD3D9.cpp | file | annotate | diff | comparison | revisions |
--- a/gfx/layers/d3d11/TextureD3D11.cpp +++ b/gfx/layers/d3d11/TextureD3D11.cpp @@ -335,20 +335,20 @@ DXGITextureHostD3D11::GetTextureSources( return mTextureSource.get(); } bool DataTextureSourceD3D11::Update(DataSourceSurface* aSurface, nsIntRegion* aDestRegion, IntPoint* aSrcOffset) { - // Right now we only support null aDestRegion and aSrcOffset (which means) - // full surface update. Incremental update is only used on Mac so it is - // not clear that we ever will need to support it for D3D. - MOZ_ASSERT(!aDestRegion && !aSrcOffset); + // Right now we only support full surface update. If aDestRegion is provided, + // It will be ignored. Incremental update with a source offset is only used + // on Mac so it is not clear that we ever will need to support it for D3D. + MOZ_ASSERT(!aSrcOffset); MOZ_ASSERT(aSurface); if (!mCompositor || !mCompositor->GetDevice()) { return false; } uint32_t bpp = BytesPerPixel(aSurface->GetFormat()); DXGI_FORMAT dxgiFormat = SurfaceFormatToDXGIFormat(aSurface->GetFormat());
--- a/gfx/layers/d3d9/TextureD3D9.cpp +++ b/gfx/layers/d3d9/TextureD3D9.cpp @@ -371,20 +371,20 @@ DataTextureSourceD3D9::GetD3D9Texture() : mTexture; } bool DataTextureSourceD3D9::Update(gfx::DataSourceSurface* aSurface, nsIntRegion* aDestRegion, gfx::IntPoint* aSrcOffset) { - // Right now we only support null aDestRegion and aSrcOffset (which means - // full surface update). Incremental update is only used on Mac so it is - // not clear that we ever will need to support it for D3D. - MOZ_ASSERT(!aDestRegion && !aSrcOffset); + // Right now we only support full surface update. If aDestRegion is provided, + // It will be ignored. Incremental update with a source offset is only used + // on Mac so it is not clear that we ever will need to support it for D3D. + MOZ_ASSERT(!aSrcOffset); if (!mCompositor || !mCompositor->device()) { NS_WARNING("No D3D device to update the texture."); return false; } mSize = aSurface->GetSize(); uint32_t bpp = 0;