yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support fps counter text on xrender

Browse source 
BUG: 323006
FIXED-IN: 4.11
REVIEW: 111878
This commit is contained in:
Thomas Lübking 2013-08-04 14:50:38 +02:00
parent e9e73f1134
commit 971fe0107c
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
effects/showfps/showfps.cpp
View file

@ -232,7 +232,18 @@ void ShowFpsEffect::paintGL(int fps)
paintDrawSizeGraph(x, y); paintDrawSizeGraph(x, y);
// Paint FPS numerical value // Paint FPS numerical value
paintFPSText(fps); if (fpsTextRect.isValid()) {
delete fpsText;
fpsText = new GLTexture(fpsTextImage(fps));
fpsText->bind();
ShaderBinder binder(ShaderManager::SimpleShader);
if (effects->compositingType() == OpenGL2Compositing) {
binder.shader()->setUniform("offset", QVector2D(0, 0));
}
fpsText->render(QRegion(fpsTextRect), fpsTextRect);
fpsText->unbind();
effects->addRepaint(fpsTextRect);
}
// Paint paint sizes // Paint paint sizes
glDisable(GL_BLEND); glDisable(GL_BLEND);
@ -284,6 +295,15 @@ void ShowFpsEffect::paintXrender(int fps)
// Paint amount of rendered pixels graph // Paint amount of rendered pixels graph
paintDrawSizeGraph(x + FPS_WIDTH + MAX_TIME, y); paintDrawSizeGraph(x + FPS_WIDTH + MAX_TIME, y);
// Paint FPS numerical value
if (fpsTextRect.isValid()) {
QImage textImg(fpsTextImage(fps));
XRenderPicture textPic(textImg);
xcb_render_composite(connection(), XCB_RENDER_PICT_OP_OVER, textPic, XCB_RENDER_PICTURE_NONE,
effects->xrenderBufferPicture(), 0, 0, 0, 0, fpsTextRect.x(), fpsTextRect.y(), textImg.width(), textImg.height());
effects->addRepaint(fpsTextRect);
}
} }
#endif #endif
@ -450,26 +470,16 @@ void ShowFpsEffect::postPaintScreen()
effects->addRepaint(fps_rect); effects->addRepaint(fps_rect);
} }
void ShowFpsEffect::paintFPSText(int fps) QImage ShowFpsEffect::fpsTextImage(int fps)
{ {
if (!fpsTextRect.isValid())
return;
QImage im(100, 100, QImage::Format_ARGB32); QImage im(100, 100, QImage::Format_ARGB32);
im.fill(0); im.fill(Qt::transparent);
QPainter painter(&im); QPainter painter(&im);
painter.setFont(textFont); painter.setFont(textFont);
painter.setPen(textColor); painter.setPen(textColor);
painter.drawText(QRect(0, 0, 100, 100), textAlign, QString::number(fps)); painter.drawText(QRect(0, 0, 100, 100), textAlign, QString::number(fps));
delete fpsText; painter.end();
fpsText = new GLTexture(im); return im;
fpsText->bind();
ShaderBinder binder(ShaderManager::SimpleShader);
if (effects->compositingType() == OpenGL2Compositing) {
binder.shader()->setUniform("offset", QVector2D(0, 0));
}
fpsText->render(QRegion(fpsTextRect), fpsTextRect);
fpsText->unbind();
effects->addRepaint(fpsTextRect);
} }
} // namespace } // namespace

2
effects/showfps/showfps.h
View file

@ -80,7 +80,7 @@ private:
void paintFPSGraph(int x, int y); void paintFPSGraph(int x, int y);
void paintDrawSizeGraph(int x, int y); void paintDrawSizeGraph(int x, int y);
void paintGraph(int x, int y, QList<int> values, QList<int> lines, bool colorize); void paintGraph(int x, int y, QList<int> values, QList<int> lines, bool colorize);
void paintFPSText(int fps); QImage fpsTextImage(int fps);
QTime t; QTime t;
enum { NUM_PAINTS = 100 }; // remember time needed to paint this many paints enum { NUM_PAINTS = 100 }; // remember time needed to paint this many paints
int paints[ NUM_PAINTS ]; // time needed to paint int paints[ NUM_PAINTS ]; // time needed to paint