Gfx: Avoid creating D2D render target when not necessary

This commit is contained in:
Birunthan Mohanathas 2013-03-28 14:43:36 +02:00
parent c6374f7c12
commit 5bf776090d

View File

@ -258,7 +258,11 @@ void CanvasD2D::SetTextAntiAliasing(bool enable)
void CanvasD2D::Clear(const Gdiplus::Color& color) void CanvasD2D::Clear(const Gdiplus::Color& color)
{ {
if (!BeginTargetDraw()) return; if (!m_Target) // Use GDI+ if D2D render target has not been created.
{
m_GdipGraphics->Clear(color);
return;
}
m_Target->Clear(ToColorF(color)); m_Target->Clear(ToColorF(color));
} }
@ -345,7 +349,12 @@ bool CanvasD2D::MeasureTextLinesW(const WCHAR* str, UINT strLen, const TextForma
void CanvasD2D::DrawBitmap(Gdiplus::Bitmap* bitmap, const Gdiplus::Rect& dstRect, const Gdiplus::Rect& srcRect) void CanvasD2D::DrawBitmap(Gdiplus::Bitmap* bitmap, const Gdiplus::Rect& dstRect, const Gdiplus::Rect& srcRect)
{ {
if (!BeginTargetDraw()) return; if (!m_Target) // Use GDI+ if D2D render target has not been created.
{
m_GdipGraphics->DrawImage(
bitmap, dstRect, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, Gdiplus::UnitPixel);
return;
}
// The D2D DrawBitmap seems to perform exactly like Gdiplus::Graphics::DrawImage since we are // The D2D DrawBitmap seems to perform exactly like Gdiplus::Graphics::DrawImage since we are
// not using a hardware accelerated render target. Nevertheless, we will use it to avoid // not using a hardware accelerated render target. Nevertheless, we will use it to avoid
@ -377,7 +386,11 @@ void CanvasD2D::DrawBitmap(Gdiplus::Bitmap* bitmap, const Gdiplus::Rect& dstRect
void CanvasD2D::FillRectangle(Gdiplus::Rect& rect, const Gdiplus::SolidBrush& brush) void CanvasD2D::FillRectangle(Gdiplus::Rect& rect, const Gdiplus::SolidBrush& brush)
{ {
if (!BeginTargetDraw()) return; if (!m_Target) // Use GDI+ if D2D render target has not been created.
{
m_GdipGraphics->FillRectangle(&brush, rect);
return;
}
Gdiplus::Color color; Gdiplus::Color color;
brush.GetColor(&color); brush.GetColor(&color);