Differential D19860 Diff 57766 plugins/scenes/opengl/scene_opengl.cpp

Changeset View

Standalone View

View Options

plugins/scenes/opengl/scene_opengl.cpp

Show First 20 Lines • Show All 655 Lines • ▼ Show 20 Line(s)650{
656 // the front buffer. It doesn't include the additional damage returned 656​ // the front buffer. It doesn't include the additional damage returned
657 // by prepareRenderingFrame(). validRegion is the region that has been 657​ // by prepareRenderingFrame(). validRegion is the region that has been
658 // repainted, and may be larger than updateRegion. 658​ // repainted, and may be larger than updateRegion.
659 QRegion updateRegion, validRegion; 659​ QRegion updateRegion, validRegion;
660 if (m_backend->perScreenRendering()) { 660​ if (m_backend->perScreenRendering()) {
661 // trigger start render timer 661​ // trigger start render timer
662 m_backend->prepareRenderingFrame(); 662​ m_backend->prepareRenderingFrame();
663 for (int i = 0; i < screens()->count(); ++i) { 663​ for (int i = 0; i < screens()->count(); ++i) {
664​ const int rotation = screens()->rotation(i);
zzagUnsubmitted
Done

const int rotation

zzag: const int rotation
664 const QRect &geo = screens()->geometry(i); 665​ const QRect &geo = screens()->geometry(i);
665 QRegion update; 666​ QRegion update;
666 QRegion valid; 667​ QRegion valid;
667 // prepare rendering makes context current on the output 668​ // prepare rendering makes context current on the output
668 QRegion repaint = m_backend->prepareRenderingForScreen(i); 669​ QRegion repaint = m_backend->prepareRenderingForScreen(i);
669 GLVertexBuffer::setVirtualScreenGeometry(geo); 670​ GLVertexBuffer::setVirtualScreenGeometry(geo);
670 GLRenderTarget::setVirtualScreenGeometry(geo); 671​ GLRenderTarget::setVirtualScreenGeometry(geo);
671 GLVertexBuffer::setVirtualScreenScale(screens()->scale(i)); 672​ GLVertexBuffer::setVirtualScreenScale(screens()->scale(i));
672 GLRenderTarget::setVirtualScreenScale(screens()->scale(i)); 673​ GLRenderTarget::setVirtualScreenScale(screens()->scale(i));
673 674​
674 const GLenum status = glGetGraphicsResetStatus(); 675​ const GLenum status = glGetGraphicsResetStatus();
675 if (status != GL_NO_ERROR) { 676​ if (status != GL_NO_ERROR) {
676 handleGraphicsReset(status); 677​ handleGraphicsReset(status);
677 return 0; 678​ return 0;
678 } 679​ }
679 680​
680 int mask = 0; 681​ int mask = 0;
681 updateProjectionMatrix(); 682​ updateProjectionMatrix(rotation);
682 paintScreen(&mask, damage.intersected(geo), repaint, &update, &valid, projectionMatrix(), geo); // call generic implementation 683​
684​ paintScreen(&mask, damage.intersected(geo), repaint, &update, &valid, rotation, projectionMatrix(), geo); // call generic implementation
683 paintCursor(); 685​ paintCursor();
684 686​
685 GLVertexBuffer::streamingBuffer()->endOfFrame(); 687​ GLVertexBuffer::streamingBuffer()->endOfFrame();
686 688​
687 m_backend->endRenderingFrameForScreen(i, valid, update); 689​ m_backend->endRenderingFrameForScreen(i, valid, update);
688 690​
689 GLVertexBuffer::streamingBuffer()->framePosted(); 691​ GLVertexBuffer::streamingBuffer()->framePosted();
690 } 692​ }
691 } else { 693​ } else {
692 m_backend->makeCurrent(); 694​ m_backend->makeCurrent();
693 QRegion repaint = m_backend->prepareRenderingFrame(); 695​ QRegion repaint = m_backend->prepareRenderingFrame();
694 696​
695 const GLenum status = glGetGraphicsResetStatus(); 697​ const GLenum status = glGetGraphicsResetStatus();
696 if (status != GL_NO_ERROR) { 698​ if (status != GL_NO_ERROR) {
697 handleGraphicsReset(status); 699​ handleGraphicsReset(status);
698 return 0; 700​ return 0;
699 } 701​ }
700 GLVertexBuffer::setVirtualScreenGeometry(screens()->geometry()); 702​ GLVertexBuffer::setVirtualScreenGeometry(screens()->geometry());
701 GLRenderTarget::setVirtualScreenGeometry(screens()->geometry()); 703​ GLRenderTarget::setVirtualScreenGeometry(screens()->geometry());
702 GLVertexBuffer::setVirtualScreenScale(1); 704​ GLVertexBuffer::setVirtualScreenScale(1);
703 GLRenderTarget::setVirtualScreenScale(1); 705​ GLRenderTarget::setVirtualScreenScale(1);
704 706​
705 int mask = 0; 707​ int mask = 0;
706 updateProjectionMatrix(); 708​ updateProjectionMatrix(0);
707 paintScreen(&mask, damage, repaint, &updateRegion, &validRegion, projectionMatrix()); // call generic implementation 709​ paintScreen(&mask, damage, repaint, &updateRegion, &validRegion, 0, projectionMatrix()); // call generic implementation
708 710​
709 if (!GLPlatform::instance()->isGLES()) { 711​ if (!GLPlatform::instance()->isGLES()) {
710 const QSize &screenSize = screens()->size(); 712​ const QSize &screenSize = screens()->size();
711 const QRegion displayRegion(0, 0, screenSize.width(), screenSize.height()); 713​ const QRegion displayRegion(0, 0, screenSize.width(), screenSize.height());
712 714​
713 // copy dirty parts from front to backbuffer 715​ // copy dirty parts from front to backbuffer
714 if (!m_backend->supportsBufferAge() && 716​ if (!m_backend->supportsBufferAge() &&
715 options->glPreferBufferSwap() == Options::CopyFrontBuffer && 717​ options->glPreferBufferSwap() == Options::CopyFrontBuffer &&
▲ Show 20 Lines • Show All 244 Lines • ▼ Show 20 Line(s)
960{ 962​{
961 if (m_lanczosFilter) { 963​ if (m_lanczosFilter) {
962 makeOpenGLContextCurrent(); 964​ makeOpenGLContextCurrent();
963 delete m_lanczosFilter; 965​ delete m_lanczosFilter;
964 m_lanczosFilter = nullptr; 966​ m_lanczosFilter = nullptr;
965 } 967​ }
966} 968​}
967 969​
968QMatrix4x4 SceneOpenGL2::createProjectionMatrix() const 970​QMatrix4x4 SceneOpenGL2::createProjectionMatrix(int rotation) const
969{ 971​{
970 // Create a perspective projection with a 60° field-of-view, 972​ // Create a perspective projection with a 60° field-of-view,
971 // and an aspect ratio of 1.0. 973​ // and an aspect ratio of 1.0.
972 const float fovY = 60.0f; 974​ const float fovY = 60.0f;
973 const float aspect = 1.0f; 975​ const float aspect = 1.0f;
974 const float zNear = 0.1f; 976​ const float zNear = 0.1f;
975 const float zFar = 100.0f; 977​ const float zFar = 100.0f;
976 978​
977 const float yMax = zNear * std::tan(fovY * M_PI / 360.0f); 979​ const float yMax = zNear * std::tan(fovY * M_PI / 360.0f);
978 const float yMin = -yMax; 980​ const float yMin = -yMax;
979 const float xMin = yMin * aspect; 981​ const float xMin = yMin * aspect;
980 const float xMax = yMax * aspect; 982​ const float xMax = yMax * aspect;
981 983​
982 QMatrix4x4 projection; 984​ QMatrix4x4 projection;
983 projection.frustum(xMin, xMax, yMin, yMax, zNear, zFar); 985​ projection.frustum(xMin, xMax, yMin, yMax, zNear, zFar);
986​ if (rotation != 0) {
987​ projection.rotate(rotation, 0, 0, 1);
zzagUnsubmitted
Done

Missing braces as well spaces after commas.

zzag: Missing braces as well spaces after commas.
988​ }
984 989​
985 // Create a second matrix that transforms screen coordinates 990​ // Create a second matrix that transforms screen coordinates
986 // to world coordinates. 991​ // to world coordinates.
987 const float scaleFactor = 1.1 * std::tan(fovY * M_PI / 360.0f) / yMax; 992​ const float scaleFactor = 1.1 * std::tan(fovY * M_PI / 360.0f) / yMax;
988 const QSize size = screens()->size(); 993​ const QSize size = screens()->size();
989 994​
990 QMatrix4x4 matrix; 995​ QMatrix4x4 matrix;
991 matrix.translate(xMin * scaleFactor, yMax * scaleFactor, -1.1); 996​ matrix.translate(xMin * scaleFactor, yMax * scaleFactor, -1.1);
992 matrix.scale( (xMax - xMin) * scaleFactor / size.width(), 997​ matrix.scale( (xMax - xMin) * scaleFactor / size.width(),
993 -(yMax - yMin) * scaleFactor / size.height(), 998​ -(yMax - yMin) * scaleFactor / size.height(),
994 0.001); 999​ 0.001);
995 1000​
996 // Combine the matrices 1001​ // Combine the matrices
997 return projection * matrix; 1002​ return projection * matrix;
998} 1003​}
999 1004​
1000void SceneOpenGL2::updateProjectionMatrix() 1005​void SceneOpenGL2::updateProjectionMatrix(int rotation)
1001{ 1006​{
1002 m_projectionMatrix = createProjectionMatrix(); 1007​ m_projectionMatrix = createProjectionMatrix(rotation);
1003} 1008​}
1004 1009​
1005void SceneOpenGL2::paintSimpleScreen(int mask, QRegion region) 1010​void SceneOpenGL2::paintSimpleScreen(int mask, QRegion region)
1006{ 1011​{
1007 m_screenProjectionMatrix = m_projectionMatrix; 1012​ m_screenProjectionMatrix = m_projectionMatrix;
1008 1013​
1009 Scene::paintSimpleScreen(mask, region); 1014​ Scene::paintSimpleScreen(mask, region);
1010} 1015​}
▲ Show 20 Lines • Show All 1564 Lines • Show Last 20 Lines