mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
ca19b65a80
- Bug 1250873 - Rename HasInternalBuffer into HasIntermediateBuffer in layers. r=sotaro (578235105f) - Bug 1256045 - Add a null-check in BufferTextureHost::EnsureWrappingTextureSource. r=jnicol (943c73559d) - Bug 1251726 - Check if Compositor is set r=nical (550d5b0164) - Bug 1251427 - Require a full update when a TextureHost switches from a TextureSource to another. r=sotaro (bc59ac4cd7) - Bug 1256693 - ISurfaceAllocator cleanup. r=sotaro (098e824d4d) - Bug 1257939 - initialize BGRX alpha channel to opaque when clearing and ignore uninitialized alpha in texture clients. r=mchang (73d778496f) - more of reapply Bug 1200595 - Consolidate the TextureClient's destruction logic (74517415ed) - Bug 1256693 - Refer to ClientIPCAllocator instead of ISurfaceAllocator where it makes sense. r=sotaro (e81f2dd923) - Bug 1236112 - Block on d3d9 video frames to complete before returning them from the decoder. r=cpearce (25114bb3c4) - Bug 1196409 - Disable D3D11-DXVA for resolutions not supported in hardware. r=jya (3007b1ebff) - Bug 1196411 - Disable DXVA on 60fps 1080p videos for AMD cards that can't decode quick enough. r=jya (9f8f67e12b) - Bug 1200775 - Check intel specific h264 decoder when checking for DXVA support. r=cpearce (e7bcbb10be) - Bug 1257013 - Part 1: Use readback to synchronize d3d9 video. r=cpearce,Bas (d247a9bed6) - Bug 1257013 - Part 2: Use readback to synchronize d3d11 video. r=cpearce,Bas (43883c1607) - missing bit of Bug 1206568: P2 (58de11b22f) - Bug 1239093 - Add pref to allow overriding of hardcoded DXVA blacklist. r=jrmuizel (dfd5e57c2f) - Bug 1217185: To allow for sandboxing, use null HWNDs when creating the D3D device for video decoding. r=mattwoodrow (0c96e66a47) - Bug 1200775 - Followup to fix typo and indent issues (b1d1c76788) - bits of Bug 1207245 - part 3 (52a1939b74) - Bug 1224199 - Don't make the TextureClient wait for compositor recycle if the GLContext is shutting down - r=nical (9a0081f217) - more of Bug 1200595 (047201fd60) - Bug 1253094, part 2 - Stop using DebugOnly for class/struct members in gfx/. r=Bas (bab6569366)
149 lines
4.3 KiB
C++
149 lines
4.3 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "WMF.h"
|
|
#include "D3D11ShareHandleImage.h"
|
|
#include "gfxImageSurface.h"
|
|
#include "gfxWindowsPlatform.h"
|
|
#include "mozilla/layers/TextureClient.h"
|
|
#include "mozilla/layers/TextureD3D11.h"
|
|
#include "mozilla/layers/CompositableClient.h"
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
#include "d3d11.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
D3D11ShareHandleImage::D3D11ShareHandleImage(const gfx::IntSize& aSize,
|
|
const gfx::IntRect& aRect)
|
|
: Image(nullptr, ImageFormat::D3D11_SHARE_HANDLE_TEXTURE),
|
|
mSize(aSize),
|
|
mPictureRect(aRect)
|
|
{
|
|
}
|
|
|
|
bool
|
|
D3D11ShareHandleImage::AllocateTexture(D3D11RecycleAllocator* aAllocator)
|
|
{
|
|
mTextureClient = aAllocator->CreateOrRecycleClient(gfx::SurfaceFormat::B8G8R8A8, mSize);
|
|
return !!mTextureClient;
|
|
}
|
|
|
|
gfx::IntSize
|
|
D3D11ShareHandleImage::GetSize()
|
|
{
|
|
return mSize;
|
|
}
|
|
|
|
TextureClient*
|
|
D3D11ShareHandleImage::GetTextureClient(CompositableClient* aClient)
|
|
{
|
|
return mTextureClient;
|
|
}
|
|
|
|
already_AddRefed<gfx::SourceSurface>
|
|
D3D11ShareHandleImage::GetAsSourceSurface()
|
|
{
|
|
RefPtr<ID3D11Texture2D> texture = GetTexture();
|
|
if (!texture) {
|
|
NS_WARNING("Cannot readback from shared texture because no texture is available.");
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<ID3D11Device> device;
|
|
texture->GetDevice(getter_AddRefs(device));
|
|
|
|
D3D11_TEXTURE2D_DESC desc;
|
|
texture->GetDesc(&desc);
|
|
|
|
CD3D11_TEXTURE2D_DESC softDesc(desc.Format, desc.Width, desc.Height);
|
|
softDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
|
|
softDesc.BindFlags = 0;
|
|
softDesc.MiscFlags = 0;
|
|
softDesc.MipLevels = 1;
|
|
softDesc.Usage = D3D11_USAGE_STAGING;
|
|
|
|
RefPtr<ID3D11Texture2D> softTexture;
|
|
HRESULT hr = device->CreateTexture2D(&softDesc,
|
|
NULL,
|
|
static_cast<ID3D11Texture2D**>(getter_AddRefs(softTexture)));
|
|
|
|
if (FAILED(hr)) {
|
|
NS_WARNING("Failed to create 2D staging texture.");
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<ID3D11DeviceContext> context;
|
|
device->GetImmediateContext(getter_AddRefs(context));
|
|
if (!context) {
|
|
return nullptr;
|
|
}
|
|
|
|
context->CopyResource(softTexture, texture);
|
|
|
|
RefPtr<gfx::DataSourceSurface> surface =
|
|
gfx::Factory::CreateDataSourceSurface(mSize, gfx::SurfaceFormat::B8G8R8X8);
|
|
if (NS_WARN_IF(!surface)) {
|
|
return nullptr;
|
|
}
|
|
|
|
gfx::DataSourceSurface::MappedSurface mappedSurface;
|
|
if (!surface->Map(gfx::DataSourceSurface::WRITE, &mappedSurface)) {
|
|
return nullptr;
|
|
}
|
|
|
|
D3D11_MAPPED_SUBRESOURCE map;
|
|
hr = context->Map(softTexture, 0, D3D11_MAP_READ, 0, &map);
|
|
if (!SUCCEEDED(hr)) {
|
|
surface->Unmap();
|
|
return nullptr;
|
|
}
|
|
|
|
for (int y = 0; y < mSize.height; y++) {
|
|
memcpy(mappedSurface.mData + mappedSurface.mStride * y,
|
|
(unsigned char*)(map.pData) + map.RowPitch * y,
|
|
mSize.width * 4);
|
|
}
|
|
|
|
context->Unmap(softTexture, 0);
|
|
surface->Unmap();
|
|
|
|
return surface.forget();
|
|
}
|
|
|
|
ID3D11Texture2D*
|
|
D3D11ShareHandleImage::GetTexture() const {
|
|
return static_cast<D3D11TextureData*>(mTextureClient->GetInternalData())->GetD3D11Texture();
|
|
}
|
|
|
|
already_AddRefed<TextureClient>
|
|
D3D11RecycleAllocator::Allocate(gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
BackendSelector aSelector,
|
|
TextureFlags aTextureFlags,
|
|
TextureAllocationFlags aAllocFlags)
|
|
{
|
|
return CreateD3D11TextureClientWithDevice(aSize, aFormat,
|
|
aTextureFlags, aAllocFlags,
|
|
mDevice, mSurfaceAllocator);
|
|
}
|
|
|
|
already_AddRefed<TextureClient>
|
|
D3D11RecycleAllocator::CreateOrRecycleClient(gfx::SurfaceFormat aFormat,
|
|
const gfx::IntSize& aSize)
|
|
{
|
|
RefPtr<TextureClient> textureClient =
|
|
CreateOrRecycle(aFormat,
|
|
aSize,
|
|
BackendSelector::Content,
|
|
layers::TextureFlags::DEFAULT,
|
|
TextureAllocationFlags::ALLOC_MANUAL_SYNCHRONIZATION);
|
|
return textureClient.forget();
|
|
}
|
|
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|