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

kwin: Make hardwareClipping a member

Browse source
This commit is contained in:
Fredrik Höglund 2013-03-17 11:50:47 +01:00
parent c92f65583a
commit 70921b8119
2 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
scene_opengl.cpp
View file

@ -1059,8 +1059,8 @@ void SceneOpenGL::Window::performPaint(int mask, QRegion region, WindowPaintData
if (region.isEmpty()) if (region.isEmpty())
return; return;
bool hardwareClipping = region != infiniteRegion() && (mask & PAINT_WINDOW_TRANSFORMED) && !(mask & PAINT_SCREEN_TRANSFORMED); m_hardwareClipping = region != infiniteRegion() && (mask & PAINT_WINDOW_TRANSFORMED) && !(mask & PAINT_SCREEN_TRANSFORMED);
if (region != infiniteRegion() && !hardwareClipping) { if (region != infiniteRegion() && !m_hardwareClipping) {
WindowQuadList quads; WindowQuadList quads;
const QRegion filterRegion = region.translated(-x(), -y()); const QRegion filterRegion = region.translated(-x(), -y());
// split all quads in bounding rect with the actual rects in the region // split all quads in bounding rect with the actual rects in the region
@ -1087,7 +1087,7 @@ void SceneOpenGL::Window::performPaint(int mask, QRegion region, WindowPaintData
return; return;
} }
if (hardwareClipping) { if (m_hardwareClipping) {
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
} }
@ -1113,13 +1113,13 @@ void SceneOpenGL::Window::performPaint(int mask, QRegion region, WindowPaintData
// shadow // shadow
if (m_shadow) { if (m_shadow) {
paintShadow(region, data, hardwareClipping); paintShadow(region, data);
} }
// decorations // decorations
if (toplevel->isClient()) { if (toplevel->isClient()) {
paintDecorations<Client>(data, region, hardwareClipping); paintDecorations<Client>(data, region);
} else if (toplevel->isDeleted()) { } else if (toplevel->isDeleted()) {
paintDecorations<Deleted>(data, region, hardwareClipping); paintDecorations<Deleted>(data, region);
} }
// paint the content // paint the content
@ -1127,19 +1127,19 @@ void SceneOpenGL::Window::performPaint(int mask, QRegion region, WindowPaintData
if (!contentQuads.empty()) { if (!contentQuads.empty()) {
texture->bind(); texture->bind();
prepareStates(Content, data.opacity(), data.brightness(), data.saturation(), data.screen()); prepareStates(Content, data.opacity(), data.brightness(), data.saturation(), data.screen());
renderQuads(mask, region, contentQuads, texture, false, hardwareClipping); renderQuads(mask, region, contentQuads, texture, false);
restoreStates(Content, data.opacity(), data.brightness(), data.saturation()); restoreStates(Content, data.opacity(), data.brightness(), data.saturation());
texture->unbind(); texture->unbind();
#ifndef KWIN_HAVE_OPENGLES #ifndef KWIN_HAVE_OPENGLES
if (m_scene && m_scene->debug) { if (m_scene && m_scene->debug) {
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
renderQuads(mask, region, contentQuads, texture, false, hardwareClipping); renderQuads(mask, region, contentQuads, texture, false);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
} }
#endif #endif
} }
if (hardwareClipping) { if (m_hardwareClipping) {
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
} }
@ -1147,7 +1147,7 @@ void SceneOpenGL::Window::performPaint(int mask, QRegion region, WindowPaintData
} }
template<class T> template<class T>
void SceneOpenGL::Window::paintDecorations(const WindowPaintData &data, const QRegion &region, bool hardwareClipping) void SceneOpenGL::Window::paintDecorations(const WindowPaintData &data, const QRegion &region)
{ {
T* t = static_cast<T*>(toplevel); T* t = static_cast<T*>(toplevel);
OpenGLPaintRedirector *redirector = static_cast<OpenGLPaintRedirector*>(t->decorationPaintRedirector()); OpenGLPaintRedirector *redirector = static_cast<OpenGLPaintRedirector*>(t->decorationPaintRedirector());
@ -1181,7 +1181,7 @@ void SceneOpenGL::Window::paintDecorations(const WindowPaintData &data, const QR
TextureType type[] = { DecorationLeftRight, DecorationTopBottom }; TextureType type[] = { DecorationLeftRight, DecorationTopBottom };
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
paintDecoration(textures[i], type[i], region, data, quads[i], hardwareClipping); paintDecoration(textures[i], type[i], region, data, quads[i]);
redirector->markAsRepainted(); redirector->markAsRepainted();
} }
@ -1189,7 +1189,7 @@ void SceneOpenGL::Window::paintDecorations(const WindowPaintData &data, const QR
void SceneOpenGL::Window::paintDecoration(GLTexture *texture, TextureType type, void SceneOpenGL::Window::paintDecoration(GLTexture *texture, TextureType type,
const QRegion &region, const WindowPaintData &data, const QRegion &region, const WindowPaintData &data,
const WindowQuadList &quads, bool hardwareClipping) const WindowQuadList &quads)
{ {
if (!texture || quads.isEmpty()) if (!texture || quads.isEmpty())
return; return;
@ -1203,7 +1203,7 @@ void SceneOpenGL::Window::paintDecoration(GLTexture *texture, TextureType type,
texture->bind(); texture->bind();
prepareStates(type, data.opacity() * data.decorationOpacity(), data.brightness(), data.saturation(), data.screen()); prepareStates(type, data.opacity() * data.decorationOpacity(), data.brightness(), data.saturation(), data.screen());
renderQuads(0, region, quads, texture, false, hardwareClipping); renderQuads(0, region, quads, texture, false);
restoreStates(type, data.opacity() * data.decorationOpacity(), data.brightness(), data.saturation()); restoreStates(type, data.opacity() * data.decorationOpacity(), data.brightness(), data.saturation());
texture->unbind(); texture->unbind();
@ -1211,13 +1211,13 @@ void SceneOpenGL::Window::paintDecoration(GLTexture *texture, TextureType type,
#ifndef KWIN_HAVE_OPENGLES #ifndef KWIN_HAVE_OPENGLES
if (m_scene && m_scene->debug) { if (m_scene && m_scene->debug) {
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
GLVertexBuffer::streamingBuffer()->render(region, GL_TRIANGLES, hardwareClipping); GLVertexBuffer::streamingBuffer()->render(region, GL_TRIANGLES, m_hardwareClipping);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
} }
#endif #endif
} }
void SceneOpenGL::Window::paintShadow(const QRegion &region, const WindowPaintData &data, bool hardwareClipping) void SceneOpenGL::Window::paintShadow(const QRegion &region, const WindowPaintData &data)
{ {
WindowQuadList quads; WindowQuadList quads;
@ -1253,20 +1253,20 @@ void SceneOpenGL::Window::paintShadow(const QRegion &region, const WindowPaintDa
texture->setWrapMode(GL_CLAMP_TO_EDGE); texture->setWrapMode(GL_CLAMP_TO_EDGE);
texture->bind(); texture->bind();
prepareStates(Shadow, data.opacity(), data.brightness(), data.saturation(), data.screen()); prepareStates(Shadow, data.opacity(), data.brightness(), data.saturation(), data.screen());
renderQuads(0, region, quads, texture, true, hardwareClipping); renderQuads(0, region, quads, texture, true);
restoreStates(Shadow, data.opacity(), data.brightness(), data.saturation()); restoreStates(Shadow, data.opacity(), data.brightness(), data.saturation());
texture->unbind(); texture->unbind();
#ifndef KWIN_HAVE_OPENGLES #ifndef KWIN_HAVE_OPENGLES
if (m_scene && m_scene->debug) { if (m_scene && m_scene->debug) {
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
renderQuads(0, region, quads, texture, true, hardwareClipping); renderQuads(0, region, quads, texture, true);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
} }
#endif #endif
} }
void SceneOpenGL::Window::renderQuads(int, const QRegion& region, const WindowQuadList& quads, void SceneOpenGL::Window::renderQuads(int, const QRegion& region, const WindowQuadList& quads,
GLTexture *tex, bool normalized, bool hardwareClipping) GLTexture *tex, bool normalized)
{ {
if (quads.isEmpty()) if (quads.isEmpty())
return; return;
@ -1281,7 +1281,7 @@ void SceneOpenGL::Window::renderQuads(int, const QRegion& region, const WindowQu
quads.makeInterleavedArrays(map, matrix); quads.makeInterleavedArrays(map, matrix);
vbo->unmap(); vbo->unmap();
vbo->render(region, GL_TRIANGLES, hardwareClipping); vbo->render(region, GL_TRIANGLES, m_hardwareClipping);
} }
GLTexture *SceneOpenGL::Window::textureForType(SceneOpenGL::Window::TextureType type) GLTexture *SceneOpenGL::Window::textureForType(SceneOpenGL::Window::TextureType type)

9
scene_opengl.h
View file

@ -231,9 +231,9 @@ protected:
}; };
QMatrix4x4 transformation(int mask, const WindowPaintData &data) const; QMatrix4x4 transformation(int mask, const WindowPaintData &data) const;
void paintDecoration(GLTexture *texture, TextureType type, const QRegion &region, const WindowPaintData &data, const WindowQuadList &quads, bool hardwareClipping); void paintDecoration(GLTexture *texture, TextureType type, const QRegion &region, const WindowPaintData &data, const WindowQuadList &quads);
void paintShadow(const QRegion &region, const WindowPaintData &data, bool hardwareClipping); void paintShadow(const QRegion &region, const WindowPaintData &data);
void renderQuads(int, const QRegion& region, const WindowQuadList& quads, GLTexture* tex, bool normalized, bool hardwareClipping); void renderQuads(int, const QRegion& region, const WindowQuadList& quads, GLTexture* tex, bool normalized);
/** /**
* @brief Called from performPaint once it is determined whether the window will be painted. * @brief Called from performPaint once it is determined whether the window will be painted.
* This method has to be implemented by the concrete sub class to perform operations for setting * This method has to be implemented by the concrete sub class to perform operations for setting
@ -284,10 +284,11 @@ protected:
protected: protected:
SceneOpenGL *m_scene; SceneOpenGL *m_scene;
bool m_hardwareClipping;
private: private:
template<class T> template<class T>
void paintDecorations(const WindowPaintData &data, const QRegion &region, bool hardwareClipping); void paintDecorations(const WindowPaintData &data, const QRegion &region);
Texture *texture; Texture *texture;
}; };