mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
96836f9b35
- Bug 1149185 - override GetMessageLoop() r=nical (42bec9405) - Add a "blacklisted" property to d3d11 telemetry. (bug 1187453, r=mattwoodrow) (83bcb0e8e) - Don't create a D3D11 compositor device on content processes. (bug 1183910 part 8, r=bas,mattwoodrow) (c03d496a6) - Bug 1168889 - ContentClientSingleBuffered needs to upload during the transaction. r=nical (35171fe14) - Bug 1176077 - Only recompute PaintedLayer item visibility when display list has changed. r=mattwoodrow (0ea691594) - Bug 1179298. ClientTiledPaintedLayer should allow empty transactions to succeed if it doesn't need to draw anything. r=mattwoodrow (4aaad97b2) - Bug 1169200 - Send OpRemoveTextureAsync before actor destroyed r=nical (86007156c) - Bug 1158838 - Add some gfxCriticalError logging. r=milan (32bf80848) - Bug 1129871 - Avoid copying TileClient when not necessary. r=BenWa (1ac30bcc2) - Bug 1186911 - Fix progressive paint when using tiled-drawtarget. r=nical (87649fb8d) - Bug 1118876 - Add edge padding with DrawTargetTiled. r=jrmuizel (64b12cf6a) - Bug 1157677 - Fix uninitialized members warning in ClientTiledLayerBuffer. r=nical (d11d0da30) - Bug 1151071 - Make sure low-resolution tiles are transparent. r=mattwoodrow (164446378) - Bug 1170390 - Use Optimal2DFormatForContent over OptimalFormatForContent to avoid enum conversions. r=jrmuizel (db7ee2c31) - Bug 1180326 - Part 1: Abstract parts of the client side tiling that we need. r=jrmuizel (0ad7651fe) - Bug 1179987 - Remove painted region from SurfaceDescriptorTiles since it isn't used any more. r=nical (653e9389e) - Bug 1180326 - Part 2: Add support for variable tile sizes. r=jrmuizel (081349a5e) - Bug 1180326 - Part 3: Move repeated code into GetBackBuffer. r=jrmuizel (2e9091ae1) - Bug 1180326 - Part 4: Add new content client. r=jrmuizel (7362d805b) - Bug 1180326 - Part 5: Support HWC with tiling when we only have 1 tile. r=jrmuizel (09ce93b7e) - Bug 1152461 - Don't use tiled layers for overflow:hidden scroll frames. r=tn (804a683a1) - Bug 961887 - Add some reftest fuzz. (dcd707004) - Bug 1186061 patch 1 - Add feature to reftest harness to allow skipping the flush. r=mattwoodrow (8cefe9640) - Bug 1176969 - Disable OMT animation for any frame in a preserve-3d scene rather than only frames whose parent and child are in a preserve-3d scene. r=mattwoodrow (693d0a518) - Bug 1176969 followup - Annotate new reftests as intermittently fuzzy on Mac. (0269d5d8f) - Bug 1176969 followup - Increase error amounts for intermittent fuzzy-if(cocoaWidget). (116039ed0) - Bug 1176969 followup - Mark test as random for now until I have a chance to rewrite it. (8ba561f83) - Bug 1176969 followup - Reorganize the timing of the reftest to make it more reliable. (f3ffc93cd) - Bug 1186061 patch 2 - Disable compositor thread animation of transforms when backface-visibility is hidden. r=mattwoodrow (e67bed9fb) - Bug 1169666 - Mark reftests failing due to scrollbar transparency random on GTK3. r=karlt (0c6080d55) - Bug 1180326 - Part 6: Use SingleTiledContentClient for non-scrollable layers on b2g and OSX. r=jrmuizel (079951f0a) - Bug 1189261 - Mark tile invalid region in coordinates relative to the tile. r=jrmuizel (7e696c911) - Bug 1187619 - Only optmimize FrameLayerBuilder visibility calculations if correct. r=mattwoodrow (05228ad31) - Bug 1190950: Check mappings and surfaces for UpdateFromSurface more robustly. r=mattwoodrow (c00adba10) - Remove the backend flag to TextureClient::CreateForDrawing. (bug 1183910 part 9, r=mattwoodrow) (5df1d964c) - Bug 1135935 - Part 1: Don't implement ISurfaceAllocator for the texture recycler. r=sotaro (bcba93d3d) - Bug 1135935 - Part 2: Merge TextureClientRecycleAllocator into base class. r=sotaro (8f4e7b6b1) - Bug 1135935 - Part 3: Allow overriding of allocations for texture client recycling. r=sotaro (35d7499e9) - Bug 1135935 - Part 4: Move IDirect3DTexture9 allocations and ownership into the TextureClient. r=jrmuizel (e62cf9acf) - Bug 1135935 - Part 5: Add D3D9 texture recycler. r=jrmuizel (8ab85b064) - Bug 1135935 - Part 6: Wait for the compositor to stop using textures before recycling them. r=jrmuizel (ae0c45cfd)
237 lines
6.9 KiB
C++
237 lines
6.9 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 "D3D9SurfaceImage.h"
|
|
#include "gfx2DGlue.h"
|
|
#include "mozilla/layers/TextureD3D9.h"
|
|
#include "mozilla/layers/CompositableClient.h"
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
#include "mozilla/layers/ImageBridgeChild.h"
|
|
#include "mozilla/gfx/Types.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
|
|
D3D9SurfaceImage::D3D9SurfaceImage()
|
|
: Image(nullptr, ImageFormat::D3D9_RGB32_TEXTURE)
|
|
, mSize(0, 0)
|
|
, mValid(false)
|
|
{}
|
|
|
|
D3D9SurfaceImage::~D3D9SurfaceImage()
|
|
{
|
|
}
|
|
|
|
HRESULT
|
|
D3D9SurfaceImage::SetData(const Data& aData)
|
|
{
|
|
NS_ENSURE_TRUE(aData.mSurface, E_POINTER);
|
|
HRESULT hr;
|
|
RefPtr<IDirect3DSurface9> surface = aData.mSurface;
|
|
|
|
RefPtr<IDirect3DDevice9> device;
|
|
hr = surface->GetDevice(byRef(device));
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), E_FAIL);
|
|
|
|
RefPtr<IDirect3D9> d3d9;
|
|
hr = device->GetDirect3D(byRef(d3d9));
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), E_FAIL);
|
|
|
|
D3DSURFACE_DESC desc;
|
|
surface->GetDesc(&desc);
|
|
// Ensure we can convert the textures format to RGB conversion
|
|
// in StretchRect. Fail if we can't.
|
|
hr = d3d9->CheckDeviceFormatConversion(D3DADAPTER_DEFAULT,
|
|
D3DDEVTYPE_HAL,
|
|
desc.Format,
|
|
D3DFMT_X8R8G8B8);
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
|
|
|
|
// DXVA surfaces aren't created sharable, so we need to copy the surface
|
|
// to a sharable texture to that it's accessible to the layer manager's
|
|
// device.
|
|
const gfx::IntRect& region = aData.mRegion;
|
|
RefPtr<SharedTextureClientD3D9> textureClient =
|
|
aData.mAllocator->CreateOrRecycleClient(gfx::SurfaceFormat::B8G8R8X8,
|
|
region.Size());
|
|
if (!textureClient) {
|
|
return E_FAIL;
|
|
}
|
|
|
|
// Copy the image onto the texture, preforming YUV -> RGB conversion if necessary.
|
|
RefPtr<IDirect3DSurface9> textureSurface = textureClient->GetD3D9Surface();
|
|
if (!textureSurface) {
|
|
return E_FAIL;
|
|
}
|
|
|
|
RECT src = { region.x, region.y, region.x+region.width, region.y+region.height };
|
|
hr = device->StretchRect(surface, &src, textureSurface, nullptr, D3DTEXF_NONE);
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
|
|
|
|
// Flush the draw command now, so that by the time we come to draw this
|
|
// image, we're less likely to need to wait for the draw operation to
|
|
// complete.
|
|
RefPtr<IDirect3DQuery9> query;
|
|
hr = device->CreateQuery(D3DQUERYTYPE_EVENT, byRef(query));
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
|
|
hr = query->Issue(D3DISSUE_END);
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
|
|
|
|
mTextureClient = textureClient;
|
|
mSize = region.Size();
|
|
mQuery = query;
|
|
|
|
return S_OK;
|
|
}
|
|
|
|
bool
|
|
D3D9SurfaceImage::IsValid()
|
|
{
|
|
EnsureSynchronized();
|
|
return mValid;
|
|
}
|
|
|
|
void
|
|
D3D9SurfaceImage::EnsureSynchronized()
|
|
{
|
|
RefPtr<IDirect3DQuery9> query = mQuery;
|
|
if (!query) {
|
|
// Not setup, or already synchronized.
|
|
return;
|
|
}
|
|
int iterations = 0;
|
|
while (iterations < 10) {
|
|
HRESULT hr = query->GetData(nullptr, 0, D3DGETDATA_FLUSH);
|
|
if (hr == S_FALSE) {
|
|
Sleep(1);
|
|
iterations++;
|
|
continue;
|
|
}
|
|
if (hr == S_OK) {
|
|
mValid = true;
|
|
}
|
|
break;
|
|
}
|
|
mQuery = nullptr;
|
|
}
|
|
|
|
const D3DSURFACE_DESC&
|
|
D3D9SurfaceImage::GetDesc() const
|
|
{
|
|
return mTextureClient->GetDesc();
|
|
}
|
|
|
|
gfx::IntSize
|
|
D3D9SurfaceImage::GetSize()
|
|
{
|
|
return mSize;
|
|
}
|
|
|
|
TextureClient*
|
|
D3D9SurfaceImage::GetTextureClient(CompositableClient* aClient)
|
|
{
|
|
MOZ_ASSERT(mTextureClient);
|
|
MOZ_ASSERT(mTextureClient->GetAllocator() == aClient->GetForwarder());
|
|
EnsureSynchronized();
|
|
return mTextureClient;
|
|
}
|
|
|
|
already_AddRefed<gfx::SourceSurface>
|
|
D3D9SurfaceImage::GetAsSourceSurface()
|
|
{
|
|
NS_ENSURE_TRUE(mTextureClient, nullptr);
|
|
|
|
HRESULT hr;
|
|
RefPtr<gfx::DataSourceSurface> surface = gfx::Factory::CreateDataSourceSurface(mSize, gfx::SurfaceFormat::B8G8R8X8);
|
|
if (NS_WARN_IF(!surface)) {
|
|
return nullptr;
|
|
}
|
|
|
|
// Ensure that the texture is ready to be used.
|
|
EnsureSynchronized();
|
|
|
|
// Readback the texture from GPU memory into system memory, so that
|
|
// we can copy it into the Cairo image. This is expensive.
|
|
RefPtr<IDirect3DSurface9> textureSurface = mTextureClient->GetD3D9Surface();
|
|
if (!textureSurface) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<IDirect3DDevice9> device = mTextureClient->GetD3D9Device();
|
|
if (!device) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<IDirect3DSurface9> systemMemorySurface;
|
|
hr = device->CreateOffscreenPlainSurface(mSize.width,
|
|
mSize.height,
|
|
D3DFMT_X8R8G8B8,
|
|
D3DPOOL_SYSTEMMEM,
|
|
byRef(systemMemorySurface),
|
|
0);
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
|
|
|
|
hr = device->GetRenderTargetData(textureSurface, systemMemorySurface);
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
|
|
|
|
D3DLOCKED_RECT rect;
|
|
hr = systemMemorySurface->LockRect(&rect, nullptr, 0);
|
|
NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
|
|
|
|
gfx::DataSourceSurface::MappedSurface mappedSurface;
|
|
if (!surface->Map(gfx::DataSourceSurface::WRITE, &mappedSurface)) {
|
|
systemMemorySurface->UnlockRect();
|
|
return nullptr;
|
|
}
|
|
|
|
const unsigned char* src = (const unsigned char*)(rect.pBits);
|
|
const unsigned srcPitch = rect.Pitch;
|
|
for (int y = 0; y < mSize.height; y++) {
|
|
memcpy(mappedSurface.mData + mappedSurface.mStride * y,
|
|
(unsigned char*)(src) + srcPitch * y,
|
|
mSize.width * 4);
|
|
}
|
|
|
|
systemMemorySurface->UnlockRect();
|
|
surface->Unmap();
|
|
|
|
return surface.forget();
|
|
}
|
|
|
|
already_AddRefed<TextureClient>
|
|
D3D9RecycleAllocator::Allocate(gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
BackendSelector aSelector,
|
|
TextureFlags aTextureFlags,
|
|
TextureAllocationFlags aAllocFlags)
|
|
{
|
|
return SharedTextureClientD3D9::Create(mSurfaceAllocator,
|
|
aFormat,
|
|
aTextureFlags,
|
|
mDevice,
|
|
aSize);
|
|
}
|
|
|
|
already_AddRefed<SharedTextureClientD3D9>
|
|
D3D9RecycleAllocator::CreateOrRecycleClient(gfx::SurfaceFormat aFormat,
|
|
const gfx::IntSize& aSize)
|
|
{
|
|
RefPtr<TextureClient> textureClient =
|
|
CreateOrRecycle(aFormat,
|
|
aSize,
|
|
BackendSelector::Content,
|
|
layers::TextureFlags::DEFAULT);
|
|
if (!textureClient) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<SharedTextureClientD3D9> textureD3D9 = static_cast<SharedTextureClientD3D9*>(textureClient.get());
|
|
return textureD3D9.forget();
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|