Differential D25737 Diff 73125 plugins/scenes/opengl/scene_opengl.cpp

Changeset View

Standalone View

View Options

plugins/scenes/opengl/scene_opengl.cpp

Show First 20 Lines • Show All 1375 Lines • ▼ Show 20 Line(s)
1376{ 1376​{
1377 if (!beginRenderWindow(mask, region, data)) 1377​ if (!beginRenderWindow(mask, region, data))
1378 return; 1378​ return;
1379 1379​
1380 QMatrix4x4 windowMatrix = transformation(mask, data); 1380​ QMatrix4x4 windowMatrix = transformation(mask, data);
1381 const QMatrix4x4 modelViewProjection = modelViewProjectionMatrix(mask, data); 1381​ const QMatrix4x4 modelViewProjection = modelViewProjectionMatrix(mask, data);
1382 const QMatrix4x4 mvpMatrix = modelViewProjection * windowMatrix; 1382​ const QMatrix4x4 mvpMatrix = modelViewProjection * windowMatrix;
1383 1383​
1384​
1385​ bool useX11TextureClamp = false;
1386​
1384 GLShader *shader = data.shader; 1387​ GLShader *shader = data.shader;
1388​ GLenum filter;
1389​
1390​ if (waylandServer()) {
1391​ filter = GL_LINEAR;
1392​ } else {
1393​ const bool isTransformed = mask & (Effect::PAINT_WINDOW_TRANSFORMED |
1394​ Effect::PAINT_SCREEN_TRANSFORMED);
1395​ useX11TextureClamp = isTransformed;
1396​ if (isTransformed && options->glSmoothScale() != 0) {
1397​ filter = GL_LINEAR;
1398​ } else {
1399​ filter = GL_NEAREST;
1400​ }
1401​ }
1402​
1385 if (!shader) { 1403​ if (!shader) {
1386 ShaderTraits traits = ShaderTrait::MapTexture; 1404​ ShaderTraits traits = ShaderTrait::MapTexture;
1405​ if (useX11TextureClamp) {
1406​ traits |= ShaderTrait::ClampTexture;
1407​ }
zzagUnsubmitted
Not Done

stray semicolon

zzag: stray semicolon
1387 1408​
1388 if (data.opacity() != 1.0 || data.brightness() != 1.0 || data.crossFadeProgress() != 1.0) 1409​ if (data.opacity() != 1.0 || data.brightness() != 1.0 || data.crossFadeProgress() != 1.0)
1389 traits |= ShaderTrait::Modulate; 1410​ traits |= ShaderTrait::Modulate;
1390 1411​
1391 if (data.saturation() != 1.0) 1412​ if (data.saturation() != 1.0)
1392 traits |= ShaderTrait::AdjustSaturation; 1413​ traits |= ShaderTrait::AdjustSaturation;
1393 1414​
1394 shader = ShaderManager::instance()->pushShader(traits); 1415​ shader = ShaderManager::instance()->pushShader(traits);
1395 } 1416​ }
1396 shader->setUniform(GLShader::ModelViewProjectionMatrix, mvpMatrix); 1417​ shader->setUniform(GLShader::ModelViewProjectionMatrix, mvpMatrix);
1397 1418​
1398 shader->setUniform(GLShader::Saturation, data.saturation()); 1419​ shader->setUniform(GLShader::Saturation, data.saturation());
1399 1420​
1400 GLenum filter; ​
1401 if (waylandServer()) { ​
1402 filter = GL_LINEAR; ​
1403 } else { ​
1404 const bool isTransformed = mask & (Effect::PAINT_WINDOW_TRANSFORMED | ​
1405 Effect::PAINT_SCREEN_TRANSFORMED); ​
1406 if (isTransformed && options->glSmoothScale() != 0) { ​
1407 filter = GL_LINEAR; ​
1408 } else { ​
1409 filter = GL_NEAREST; ​
1410 } ​
1411 } ​
1412 ​
1413 WindowQuadList quads[LeafCount]; 1421​ WindowQuadList quads[LeafCount];
zzagUnsubmitted
Not Done

stray whitespace

zzag: stray whitespace
1414 1422​
1415 // Split the quads into separate lists for each type 1423​ // Split the quads into separate lists for each type
1416 foreach (const WindowQuad &quad, data.quads) { 1424​ foreach (const WindowQuad &quad, data.quads) {
1417 switch (quad.type()) { 1425​ switch (quad.type()) {
1418 case WindowQuadDecoration: 1426​ case WindowQuadDecoration:
1419 quads[DecorationLeaf].append(quad); 1427​ quads[DecorationLeaf].append(quad);
1420 continue; 1428​ continue;
1421 1429​
▲ Show 20 Lines • Show All 79 Lines • ▼ Show 20 Line(s)1508 shader->setUniform(GLShader::ModulationConstant,
1501 modulate(nodes[i].opacity, data.brightness())); 1509​ modulate(nodes[i].opacity, data.brightness()));
1502 opacity = nodes[i].opacity; 1510​ opacity = nodes[i].opacity;
1503 } 1511​ }
1504 1512​
1505 nodes[i].texture->setFilter(filter); 1513​ nodes[i].texture->setFilter(filter);
1506 nodes[i].texture->setWrapMode(GL_CLAMP_TO_EDGE); 1514​ nodes[i].texture->setWrapMode(GL_CLAMP_TO_EDGE);
1507 nodes[i].texture->bind(); 1515​ nodes[i].texture->bind();
1508 1516​
1517​ if (i == ContentLeaf && useX11TextureClamp) {
1518​ // X11 windows are reparented to have their buffer in the middle of a larger texture
1519​ // holding the frame window.
1520​ // This code passes the texture geometry to the fragment shader
1521​ // any samples near the edge of the texture will be constrained to be
1522​ // at least half a pixel in bounds, meaning we don't bleed the transparent border
1523​ QRectF bufferContentRect = clientShape().boundingRect();
1524​ bufferContentRect.adjust(0.5, 0.5, -0.5, -0.5);
1525​ const QRect bufferGeometry = toplevel->bufferGeometry();
1526​
1527​ float leftClamp = bufferContentRect.left() / bufferGeometry.width();
1528​ float topClamp = bufferContentRect.top() / bufferGeometry.height();
1529​ float rightClamp = bufferContentRect.right() / bufferGeometry.width();
1530​ float bottomClamp = bufferContentRect.bottom() / bufferGeometry.height();
1531​ shader->setUniform(GLShader::TextureClamp, QVector4D({leftClamp, topClamp, rightClamp, bottomClamp}));
1532​ } else {
1533​ shader->setUniform(GLShader::TextureClamp, QVector4D({0, 0, 1, 1}));
1534​ }
1535​
1509 vbo->draw(region, primitiveType, nodes[i].firstVertex, nodes[i].vertexCount, m_hardwareClipping); 1536​ vbo->draw(region, primitiveType, nodes[i].firstVertex, nodes[i].vertexCount, m_hardwareClipping);
1510 } 1537​ }
1511 1538​
1512 vbo->unbindArrays(); 1539​ vbo->unbindArrays();
1513 1540​
1514 // render sub-surfaces 1541​ // render sub-surfaces
1515 auto wp = windowPixmap<OpenGLWindowPixmap>(); 1542​ auto wp = windowPixmap<OpenGLWindowPixmap>();
1516 const auto &children = wp ? wp->children() : QVector<WindowPixmap*>(); 1543​ const auto &children = wp ? wp->children() : QVector<WindowPixmap*>();
▲ Show 20 Lines • Show All 1117 Lines • Show Last 20 Lines