Merge pull request #286 from Martchus/anti-aliasing

Allow enabling MXAA
This commit is contained in:
louis-barman 2021-05-20 12:38:27 +01:00 committed by GitHub
commit c8c2f5248c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions

View File

@ -338,6 +338,10 @@ void CGLView::initializeGL()
//glGenTextures(1, &texName);
//glBindTexture(GL_TEXTURE_2D, texName);
if (format().samples() > 0) {
glEnable(GL_MULTISAMPLE);
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

View File

@ -62,13 +62,12 @@ QtWindow::QtWindow()
decodeCommandLine();
QGLFormat fmt = QGLFormat::defaultFormat();
if (Cfg::experimentalSwapInterval != -1)
{
QGLFormat fmt;
fmt.setSwapInterval(Cfg::experimentalSwapInterval);
int value = fmt.swapInterval();
ppLogInfo("Open GL Swap Interval %d", value);
QGLFormat::setDefaultFormat(fmt);
}
for (int i = 0; i < MAX_RECENT_FILES; ++i)
@ -80,6 +79,13 @@ QtWindow::QtWindow()
set_realtime_priority(SCHED_FIFO, rt_prio);
#endif
QString antiAliasingSetting = m_settings->value("anti-aliasing").toString();
if (antiAliasingSetting.isEmpty() || antiAliasingSetting=="on"){
fmt.setSamples(4);
}
QGLFormat::setDefaultFormat(fmt);
m_glWidget = new CGLView(this, m_settings);
m_glWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);