From 5bf776090dd901770560ae98b77ba2d22847e628 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Thu, 28 Mar 2013 14:43:36 +0200
Subject: [PATCH] Gfx: Avoid creating D2D render target when not necessary

---
 Common/Gfx/CanvasD2D.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Common/Gfx/CanvasD2D.cpp b/Common/Gfx/CanvasD2D.cpp
index 97d8092d..2b631a7c 100644
--- a/Common/Gfx/CanvasD2D.cpp
+++ b/Common/Gfx/CanvasD2D.cpp
@@ -258,7 +258,11 @@ void CanvasD2D::SetTextAntiAliasing(bool enable)
 
 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));
 }
@@ -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)
 {
-	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
 	// 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)
 {
-	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;
 	brush.GetColor(&color);