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

scene: Fix clipping in software cursor

Browse source
This commit is contained in:
Vlad Zahorodnii 2024-01-09 11:20:43 +02:00
parent 5bb209a869
commit 9bbcc746c6
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/scene/cursordelegate_opengl.cpp
View file

@ -32,7 +32,8 @@ CursorDelegateOpenGL::~CursorDelegateOpenGL()
void CursorDelegateOpenGL::paint(const RenderTarget &renderTarget, const QRegion &region) void CursorDelegateOpenGL::paint(const RenderTarget &renderTarget, const QRegion &region)
{ {
if (!region.intersects(layer()->mapToGlobal(layer()->rect()).toAlignedRect())) { const QRegion dirty = region.intersected(layer()->mapToGlobal(layer()->rect()).toAlignedRect());
if (dirty.isEmpty()) {
return; return;
} }
@ -64,6 +65,13 @@ void CursorDelegateOpenGL::paint(const RenderTarget &renderTarget, const QRegion
GLFramebuffer *fbo = renderTarget.framebuffer(); GLFramebuffer *fbo = renderTarget.framebuffer();
GLFramebuffer::pushFramebuffer(fbo); GLFramebuffer::pushFramebuffer(fbo);
const bool clipping = region != infiniteRegion();
const QRegion clipRegion = clipping ? RenderViewport(m_output->fractionalGeometry(), m_output->scale(), renderTarget).mapToRenderTarget(dirty) : infiniteRegion();
if (clipping) {
glEnable(GL_SCISSOR_TEST);
}
// Don't need to call GLVertexBuffer::beginFrame() and GLVertexBuffer::endOfFrame() because // Don't need to call GLVertexBuffer::beginFrame() and GLVertexBuffer::endOfFrame() because
// the GLVertexBuffer::streamingBuffer() is not being used when painting cursor. // the GLVertexBuffer::streamingBuffer() is not being used when painting cursor.
glEnable(GL_BLEND); glEnable(GL_BLEND);
@ -71,9 +79,13 @@ void CursorDelegateOpenGL::paint(const RenderTarget &renderTarget, const QRegion
ShaderBinder binder(ShaderTrait::MapTexture); ShaderBinder binder(ShaderTrait::MapTexture);
binder.shader()->setUniform(GLShader::ModelViewProjectionMatrix, mvp); binder.shader()->setUniform(GLShader::ModelViewProjectionMatrix, mvp);
m_texture->render(region, cursorRect.size()); m_texture->render(clipRegion, cursorRect.size(), clipping);
glDisable(GL_BLEND); glDisable(GL_BLEND);
if (clipping) {
glDisable(GL_SCISSOR_TEST);
}
GLFramebuffer::popFramebuffer(); GLFramebuffer::popFramebuffer();
} }