Bug 1069592: Annotate several more Direct2D errors. r=jrmuizel

This commit is contained in:
Bas Schouten 2014-09-19 00:01:25 +02:00
Родитель b80e27d67f
Коммит 3022f3b91f
1 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -1348,7 +1348,7 @@ DrawTargetD2D::Init(const IntSize &aSize, SurfaceFormat aFormat)
mFormat = aFormat;
if (!Factory::GetDirect3D10Device()) {
gfxDebug() << "Failed to Init Direct2D DrawTarget (No D3D10 Device set.)";
gfxCriticalError() << "Failed to Init Direct2D DrawTarget (No D3D10 Device set.)";
return false;
}
mDevice = Factory::GetDirect3D10Device();
@ -1362,7 +1362,7 @@ DrawTargetD2D::Init(const IntSize &aSize, SurfaceFormat aFormat)
hr = mDevice->CreateTexture2D(&desc, nullptr, byRef(mTexture));
if (FAILED(hr)) {
gfxDebug() << "Failed to init Direct2D DrawTarget. Size: " << mSize << " Code: " << hr;
gfxCriticalError() << "Failed to init Direct2D DrawTarget. Size: " << mSize << " Code: " << hr;
return false;
}
@ -1393,7 +1393,7 @@ DrawTargetD2D::Init(ID3D10Texture2D *aTexture, SurfaceFormat aFormat)
hr = device->QueryInterface((ID3D10Device1**)byRef(mDevice));
if (FAILED(hr)) {
gfxWarning() << "Failed to get D3D10 device from texture.";
gfxCriticalError() << "Failed to get D3D10 device from texture.";
return false;
}
@ -1512,6 +1512,7 @@ bool
DrawTargetD2D::InitD2DRenderTarget()
{
if (!factory()) {
gfxCriticalError() << "No valid D2D factory available.";
return false;
}
@ -1960,7 +1961,7 @@ DrawTargetD2D::CreateRTForTexture(ID3D10Texture2D *aTexture, SurfaceFormat aForm
hr = aTexture->QueryInterface((IDXGISurface**)byRef(surface));
if (FAILED(hr)) {
gfxWarning() << "Failed to QI texture to surface.";
gfxCriticalError() << "Failed to QI texture to surface.";
return nullptr;
}
@ -1978,7 +1979,7 @@ DrawTargetD2D::CreateRTForTexture(ID3D10Texture2D *aTexture, SurfaceFormat aForm
hr = factory()->CreateDxgiSurfaceRenderTarget(surface, props, byRef(rt));
if (FAILED(hr)) {
gfxWarning() << "Failed to create D2D render target for texture.";
gfxCriticalError() << "Failed to create D2D render target for texture.";
return nullptr;
}