Bug 1074952 - Part 6. Fully qualify the appropriate logs in the logging macros, otherwise we can't call these from other namespaces. An example in non-gfx/2d where it would not have worked without this change. r=botond

This commit is contained in:
Milan Sreckovic 2014-11-18 10:51:39 -05:00
Родитель 1d0aad208e
Коммит d19b0d26a2
3 изменённых файлов: 10 добавлений и 7 удалений

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

@ -364,18 +364,18 @@ typedef Log<LOG_WARNING> WarningLog;
typedef Log<LOG_CRITICAL, CriticalLogger> CriticalLog; typedef Log<LOG_CRITICAL, CriticalLogger> CriticalLog;
#ifdef GFX_LOG_DEBUG #ifdef GFX_LOG_DEBUG
#define gfxDebug DebugLog #define gfxDebug mozilla::gfx::DebugLog
#else #else
#define gfxDebug if (1) ; else NoLog #define gfxDebug if (1) ; else mozilla::gfx::NoLog
#endif #endif
#ifdef GFX_LOG_WARNING #ifdef GFX_LOG_WARNING
#define gfxWarning WarningLog #define gfxWarning mozilla::gfx::WarningLog
#else #else
#define gfxWarning if (1) ; else NoLog #define gfxWarning if (1) ; else mozilla::gfx::NoLog
#endif #endif
// This log goes into crash reports, use with care. // This log goes into crash reports, use with care.
#define gfxCriticalError CriticalLog #define gfxCriticalError mozilla::gfx::CriticalLog
// See nsDebug.h and the NS_WARN_IF macro // See nsDebug.h and the NS_WARN_IF macro

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

@ -32,6 +32,9 @@ TextureClientPool::TextureClientPool(gfx::SurfaceFormat aFormat, gfx::IntSize aS
, mSurfaceAllocator(aAllocator) , mSurfaceAllocator(aAllocator)
{ {
mTimer = do_CreateInstance("@mozilla.org/timer;1"); mTimer = do_CreateInstance("@mozilla.org/timer;1");
if (aFormat == gfx::SurfaceFormat::UNKNOWN) {
gfxWarning() << "Creating texture pool for SurfaceFormat::UNKNOWN format";
}
} }
TextureClientPool::~TextureClientPool() TextureClientPool::~TextureClientPool()

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

@ -288,7 +288,7 @@ TextureClientD3D11::Unlock()
HRESULT hr = device->CreateTexture2D(&desc, nullptr, byRef(tex)); HRESULT hr = device->CreateTexture2D(&desc, nullptr, byRef(tex));
if (FAILED(hr)) { if (FAILED(hr)) {
gfx::gfxCriticalError() << "[D3D11] CreateTexture2D failure " << mSize << " Code: " << gfx::hexa(hr); gfxCriticalError() << "[D3D11] CreateTexture2D failure " << mSize << " Code: " << gfx::hexa(hr);
return; return;
} }
@ -375,7 +375,7 @@ TextureClientD3D11::AllocateForSurface(gfx::IntSize aSize, TextureAllocationFlag
} }
if (FAILED(hr)) { if (FAILED(hr)) {
gfx::gfxCriticalError() << "[D3D11] CreateTexture2D failure " << aSize << " Code: " << gfx::hexa(hr); gfxCriticalError() << "[D3D11] CreateTexture2D failure " << aSize << " Code: " << gfx::hexa(hr);
return false; return false;
} }