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

Do not use QPixmap::x11PictureHandle() to render shadow elements

Browse source 
The QPixmap's are wrapped using XRenderPicture.
This commit is contained in:
Martin Gräßlin 2013-02-27 12:56:38 +01:00
parent ce930dfc8a
commit 4a69ffb5c0
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scene_xrender.cpp
View file

@ -611,7 +611,7 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
for (PaintClipper::Iterator iterator; !iterator.isDone(); iterator.next()) { for (PaintClipper::Iterator iterator; !iterator.isDone(); iterator.next()) {
#define RENDER_SHADOW_TILE(_TILE_, _RECT_) \ #define RENDER_SHADOW_TILE(_TILE_, _RECT_) \
XRenderComposite(display(), PictOpOver, m_xrenderShadow->shadowPixmap(SceneXRenderShadow::ShadowElement##_TILE_).x11PictureHandle(), \ xcb_render_composite(connection(), XCB_RENDER_PICT_OP_OVER, m_xrenderShadow->picture(SceneXRenderShadow::ShadowElement##_TILE_), \
shadowAlpha, renderTarget, 0, 0, 0, 0, _RECT_.x(), _RECT_.y(), _RECT_.width(), _RECT_.height()) shadowAlpha, renderTarget, 0, 0, 0, 0, _RECT_.x(), _RECT_.y(), _RECT_.width(), _RECT_.height())
//shadow //shadow
@ -976,10 +976,16 @@ void SceneXrender::EffectFrame::updateTextPicture()
SceneXRenderShadow::SceneXRenderShadow(Toplevel *toplevel) SceneXRenderShadow::SceneXRenderShadow(Toplevel *toplevel)
:Shadow(toplevel) :Shadow(toplevel)
{ {
for (int i=0; i<ShadowElementsCount; ++i) {
m_pictures[i] = NULL;
}
} }
SceneXRenderShadow::~SceneXRenderShadow() SceneXRenderShadow::~SceneXRenderShadow()
{ {
for (int i=0; i<ShadowElementsCount; ++i) {
delete m_pictures[i];
}
} }
void SceneXRenderShadow::layoutShadowRects(QRect& top, QRect& topRight, void SceneXRenderShadow::layoutShadowRects(QRect& top, QRect& topRight,
@ -1022,13 +1028,25 @@ void SceneXRenderShadow::buildQuads()
QRect stlr, str, strr, srr, sbrr, sbr, sblr, slr; QRect stlr, str, strr, srr, sbrr, sbr, sblr, slr;
layoutShadowRects(str, strr, srr, sbrr, sbr, sblr, slr, stlr); layoutShadowRects(str, strr, srr, sbrr, sbr, sblr, slr, stlr);
}
XRenderPictureAttributes attr; bool SceneXRenderShadow::prepareBackend()
attr.repeat = True; {
for (int i = 0; i < ShadowElementsCount; ++i) { const uint32_t values[] = {XCB_RENDER_REPEAT_NORMAL};
XRenderChangePicture(display(), shadowPixmap((Shadow::ShadowElements)i).x11PictureHandle(), CPRepeat, &attr); for (int i=0; i<ShadowElementsCount; ++i) {
delete m_pictures[i];
m_pictures[i] = new XRenderPicture(shadowPixmap(ShadowElements(i)));
xcb_render_change_picture(connection(), *m_pictures[i], XCB_RENDER_CP_REPEAT, values);
} }
return true;
}
xcb_render_picture_t SceneXRenderShadow::picture(Shadow::ShadowElements element) const
{
if (!m_pictures[element]) {
return XCB_RENDER_PICTURE_NONE;
}
return *m_pictures[element];
} }
} // namespace } // namespace

7
scene_xrender.h
View file

@ -172,12 +172,13 @@ public:
QRect& right, QRect& bottomRight, QRect& right, QRect& bottomRight,
QRect& bottom, QRect& bottomLeft, QRect& bottom, QRect& bottomLeft,
QRect& Left, QRect& topLeft); QRect& Left, QRect& topLeft);
xcb_render_picture_t picture(ShadowElements element) const;
protected: protected:
virtual void buildQuads(); virtual void buildQuads();
virtual bool prepareBackend() { virtual bool prepareBackend();
return true; private:
}; XRenderPicture* m_pictures[ShadowElementsCount];
}; };
} // namespace } // namespace