mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: improve opengl glyph cache debugging.

Browse Source 
Show cutting rectangles, base-lines, and count box widths.

Change-Id: Ic6a08c4c029d6b576ea55479bbf6293accae6f15
Reviewed-on: https://gerrit.libreoffice.org/23251
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks
2016-02-23 15:01:03 +00:00
parent 841a58da93
commit 04ce76c721
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vcl/win/gdi/winlayout.cxx
View File

@@ -280,17 +280,34 @@ void DumpGlyphBitmap(HDC hDC, const OpenGLGlyphCacheChunk& rChunk)
SAL_INFO("vcl.gdi.opengl", "Bitmap " << hBitmap << ": " << aBitmap.bmWidth << "x" << aBitmap.bmHeight << ":"); SAL_INFO("vcl.gdi.opengl", "Bitmap " << hBitmap << ": " << aBitmap.bmWidth << "x" << aBitmap.bmHeight << ":");
std::ostringstream sLine("\n", std::ios_base::ate); std::ostringstream sLine("\n", std::ios_base::ate);
std::ostringstream sScale;
long nPrintWidth = std::min(125l, aBitmap.bmWidth);
for (long y = 0; y < aBitmap.bmHeight; y++) for (long y = 0; y < aBitmap.bmHeight; y++)
{ {
if (y == rChunk.mnBaselineOffset + rChunk.getExtraOffset()) if (y == rChunk.mnBaselineOffset + rChunk.getExtraOffset())
sLine << "-"; sLine << "--------------------------\n";
else long n = 0;
sLine << ColorFor(GetPixel(hDC, 0, y)); for (long x = 0; x < nPrintWidth; x++)
for (long x = 1; x < std::min(75l, aBitmap.bmWidth); x++) {
// delimit.
for (size_t i = 0; i < rChunk.maLocation.size(); ++i)
{
if (x == rChunk.maLocation[i].Right())
{
n = 0;
sLine << '|';
if (y == 0)
sScale << ' ';
break;
}
}
sLine << ColorFor(GetPixel(hDC, x, y)); sLine << ColorFor(GetPixel(hDC, x, y));
if (y < aBitmap.bmHeight - 1) if (y == 0)
sLine << "\n"; sScale << (n++ % 10);
}
sLine << "\n";
} }
sLine << sScale.str();
SAL_INFO("vcl.gdi.opengl", sLine.str()); SAL_INFO("vcl.gdi.opengl", sLine.str());
} }
@@ -565,7 +582,6 @@ bool WinFontInstance::AddChunkOfGlyphs(bool bRealGlyphIndices, int nGlyphIndex,
#ifdef SAL_LOG_INFO #ifdef SAL_LOG_INFO
SAL_INFO("vcl.gdi.opengl", "this=" << this << " now: " << maOpenGLGlyphCache); SAL_INFO("vcl.gdi.opengl", "this=" << this << " now: " << maOpenGLGlyphCache);
DumpGlyphBitmap(aDC.getCompatibleHDC(), aChunk); DumpGlyphBitmap(aDC.getCompatibleHDC(), aChunk);
{ {
std::ostringstream sLine; std::ostringstream sLine;
for (int i = 0; i < nCount; i++) for (int i = 0; i < nCount; i++)