Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 615316 - Part 4: Store device on CairoImageD3D9 instead of on the LayerManager. r=jrmuizel a=blocking-betan

Browse Source
This commit is contained in:
Bas Schouten 2010-12-20 22:35:31 +00:00
parent 9d5e5cc13f
commit f2d3583dfc
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/layers/d3d9/ImageLayerD3D9.cpp
View File

@ -65,7 +65,7 @@ ImageContainerD3D9::CreateImage(const Image::Format *aFormats,
if (aFormats[0] == Image::PLANAR_YCBCR) {
img = new PlanarYCbCrImageD3D9(static_cast<LayerManagerD3D9*>(mManager));
} else if (aFormats[0] == Image::CAIRO_SURFACE) {
img = new CairoImageD3D9(static_cast<LayerManagerD3D9*>(mManager));
img = new CairoImageD3D9(static_cast<LayerManagerD3D9*>(mManager)->device());
}
return img.forget();
}
@ -494,18 +494,22 @@ CairoImageD3D9::GetOrCreateTexture()
context->SetSource(mCachedSurface);
context->Paint();
if (mManager->deviceManager()->IsD3D9Ex()) {
nsRefPtr<IDirect3DDevice9Ex> deviceEx;
mDevice->QueryInterface(__uuidof(IDirect3DDevice9Ex),
getter_AddRefs(deviceEx));
if (deviceEx) {
// D3D9Ex doesn't support managed textures. We could use dynamic textures
// here but since Images are immutable that probably isn't such a great
// idea.
if (FAILED(mManager->device()->
if (FAILED(mDevice->
CreateTexture(mSize.width, mSize.height,
1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT,
getter_AddRefs(mTexture), NULL)))
return NULL;
nsRefPtr<IDirect3DSurface9> surface;
if (FAILED(mManager->device()->
if (FAILED(mDevice->
CreateOffscreenPlainSurface(mSize.width,
mSize.height,
D3DFMT_A8R8G8B8,
@ -526,9 +530,9 @@ CairoImageD3D9::GetOrCreateTexture()
surface->UnlockRect();
nsRefPtr<IDirect3DSurface9> dstSurface;
mTexture->GetSurfaceLevel(0, getter_AddRefs(dstSurface));
mManager->device()->UpdateSurface(surface, NULL, dstSurface, NULL);
mDevice->UpdateSurface(surface, NULL, dstSurface, NULL);
} else {
if (FAILED(mManager->device()->
if (FAILED(mDevice->
CreateTexture(mSize.width, mSize.height,
1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED,
getter_AddRefs(mTexture), NULL)))

5
gfx/layers/d3d9/ImageLayerD3D9.h
View File

@ -138,9 +138,9 @@ class THEBES_API CairoImageD3D9 : public CairoImage,
public ImageD3D9
{
public:
CairoImageD3D9(LayerManagerD3D9 *aManager)
CairoImageD3D9(IDirect3DDevice9 *aDevice)
: CairoImage(static_cast<ImageD3D9*>(this))
, mManager(aManager)
, mDevice(aDevice)
{ }
~CairoImageD3D9();
@ -158,6 +158,7 @@ public:
private:
gfxIntSize mSize;
nsRefPtr<gfxASurface> mCachedSurface;
nsRefPtr<IDirect3DDevice9> mDevice;
nsRefPtr<IDirect3DTexture9> mTexture;
LayerManagerD3D9 *mManager;
};