Skip to content

introduce DrawingMode to reduce switching #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 28, 2017
Merged

introduce DrawingMode to reduce switching #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9eb2144
introduce DwraingMode to reduce switching
koron Nov 28, 2017
78819bd
check interop mode by mDMode
koron Nov 28, 2017
e3f2c2e
to show diff beautifully
koron Nov 28, 2017
040aae7
Fix coding style
k-takata Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 60 additions & 49 deletions src/gui_dwrite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,15 @@ class FontCache {
}
};

enum DrawingMode {
DM_GDI = 0,
DM_DIRECTX = 1,
DM_INTEROP = 2,
};

struct DWriteContext {
HDC mHDC;
DrawingMode mDMode;
HDC mInteropHDC;
bool mDrawing;
bool mFallbackDC;
Expand Down Expand Up @@ -303,9 +310,7 @@ struct DWriteContext {

void BindDC(HDC hdc, const RECT *rect);

void AssureDrawing();

HRESULT AssureInterop();
HRESULT SetDrawingMode(DrawingMode mode);

ID2D1Brush* SolidBrush(COLORREF color);

Expand All @@ -321,8 +326,6 @@ struct DWriteContext {

void Flush();

void FlushInterop();

void SetRenderingParams(
const DWriteRenderingParams *params);

Expand Down Expand Up @@ -571,6 +574,7 @@ class TextRenderer FINAL : public IDWriteTextRenderer

DWriteContext::DWriteContext() :
mHDC(NULL),
mDMode(DM_GDI),
mInteropHDC(NULL),
mDrawing(false),
mFallbackDC(false),
Expand Down Expand Up @@ -854,22 +858,51 @@ DWriteContext::BindDC(HDC hdc, const RECT *rect)
mHDC = hdc;
}

void
DWriteContext::AssureDrawing()
{
if (mDrawing == false)
{
mRT->BeginDraw();
mDrawing = true;
}
}

HRESULT
DWriteContext::AssureInterop()
DWriteContext::SetDrawingMode(DrawingMode mode)
{
HRESULT hr = S_OK;
if (mInteropHDC == NULL)
hr = mGDIRT->GetDC(D2D1_DC_INITIALIZE_MODE_COPY, &mInteropHDC);

switch (mode)
{
default:
case DM_GDI:
if (mInteropHDC != NULL)
{
mGDIRT->ReleaseDC(NULL);
mInteropHDC = NULL;
}
if (mDrawing)
{
mRT->EndDraw();
mDrawing = false;
}
break;

case DM_DIRECTX:
if (mInteropHDC != NULL)
{
mGDIRT->ReleaseDC(NULL);
mInteropHDC = NULL;
}
else if (mDrawing == false)
{
mRT->BeginDraw();
mDrawing = true;
}
break;

case DM_INTEROP:
if (mDrawing == false)
{
mRT->BeginDraw();
mDrawing = true;
}
if (mInteropHDC == NULL)
hr = mGDIRT->GetDC(D2D1_DC_INITIALIZE_MODE_COPY, &mInteropHDC);
break;
}
mDMode = mode;
return hr;
}

Expand All @@ -886,12 +919,10 @@ DWriteContext::DrawText(const WCHAR *text, int len,
int x, int y, int w, int h, int cellWidth, COLORREF color,
UINT fuOptions, const RECT *lprc, const INT *lpDx)
{
AssureDrawing();

if (mFallbackDC)
{
// Fall back to GDI rendering.
HRESULT hr = AssureInterop();
HRESULT hr = SetDrawingMode(DM_INTEROP);
if (SUCCEEDED(hr))
{
HGDIOBJ hFont = ::GetCurrentObject(mHDC, OBJ_FONT);
Expand All @@ -907,7 +938,7 @@ DWriteContext::DrawText(const WCHAR *text, int len,
HRESULT hr;
IDWriteTextLayout *textLayout = NULL;

FlushInterop();
SetDrawingMode(DM_DIRECTX);

hr = mDWriteFactory->CreateTextLayout(text, len, mTextFormat,
FLOAT(w), FLOAT(h), &textLayout);
Expand All @@ -929,9 +960,7 @@ DWriteContext::DrawText(const WCHAR *text, int len,
void
DWriteContext::FillRect(const RECT *rc, COLORREF color)
{
AssureDrawing();

if (mInteropHDC != NULL)
if (mDMode == DM_INTEROP)
{
// GDI functions are used before this call. Keep using GDI.
// (Switching to Direct2D causes terrible slowdown.)
Expand All @@ -941,6 +970,7 @@ DWriteContext::FillRect(const RECT *rc, COLORREF color)
}
else
{
SetDrawingMode(DM_DIRECTX);
mRT->FillRectangle(
D2D1::RectF(FLOAT(rc->left), FLOAT(rc->top),
FLOAT(rc->right), FLOAT(rc->bottom)),
Expand All @@ -951,9 +981,7 @@ DWriteContext::FillRect(const RECT *rc, COLORREF color)
void
DWriteContext::DrawLine(int x1, int y1, int x2, int y2, COLORREF color)
{
AssureDrawing();

if (mInteropHDC != NULL)
if (mDMode == DM_INTEROP)
{
// GDI functions are used before this call. Keep using GDI.
// (Switching to Direct2D causes terrible slowdown.)
Expand All @@ -966,6 +994,7 @@ DWriteContext::DrawLine(int x1, int y1, int x2, int y2, COLORREF color)
}
else
{
SetDrawingMode(DM_DIRECTX);
mRT->DrawLine(
D2D1::Point2F(FLOAT(x1), FLOAT(y1) + 0.5f),
D2D1::Point2F(FLOAT(x2), FLOAT(y2) + 0.5f),
Expand All @@ -976,16 +1005,15 @@ DWriteContext::DrawLine(int x1, int y1, int x2, int y2, COLORREF color)
void
DWriteContext::SetPixel(int x, int y, COLORREF color)
{
AssureDrawing();

if (mInteropHDC != NULL)
if (mDMode == DM_INTEROP)
{
// GDI functions are used before this call. Keep using GDI.
// (Switching to Direct2D causes terrible slowdown.)
::SetPixel(mInteropHDC, x, y, color);
}
else
{
SetDrawingMode(DM_DIRECTX);
// Direct2D doesn't have SetPixel API. Use DrawLine instead.
mRT->DrawLine(
D2D1::Point2F(FLOAT(x), FLOAT(y) + 0.5f),
Expand All @@ -997,24 +1025,7 @@ DWriteContext::SetPixel(int x, int y, COLORREF color)
void
DWriteContext::Flush()
{
if (mDrawing)
{
FlushInterop();
mRT->EndDraw();
mDrawing = false;
}
}

/* Flush GDI drawing.
* This should be called before drawing by Direct2D APIs. */
void
DWriteContext::FlushInterop()
{
if (mInteropHDC != NULL)
{
mGDIRT->ReleaseDC(NULL);
mInteropHDC = NULL;
}
SetDrawingMode(DM_GDI);
}

void
Expand Down