Merge pull request #286 from Martchus/anti-aliasing
Allow enabling MXAA
This commit is contained in:
commit
c8c2f5248c
|
@ -338,6 +338,10 @@ void CGLView::initializeGL()
|
||||||
//glGenTextures(1, &texName);
|
//glGenTextures(1, &texName);
|
||||||
//glBindTexture(GL_TEXTURE_2D, 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_S, GL_REPEAT);
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||||
|
|
|
@ -62,13 +62,12 @@ QtWindow::QtWindow()
|
||||||
|
|
||||||
decodeCommandLine();
|
decodeCommandLine();
|
||||||
|
|
||||||
|
QGLFormat fmt = QGLFormat::defaultFormat();
|
||||||
if (Cfg::experimentalSwapInterval != -1)
|
if (Cfg::experimentalSwapInterval != -1)
|
||||||
{
|
{
|
||||||
QGLFormat fmt;
|
|
||||||
fmt.setSwapInterval(Cfg::experimentalSwapInterval);
|
fmt.setSwapInterval(Cfg::experimentalSwapInterval);
|
||||||
int value = fmt.swapInterval();
|
int value = fmt.swapInterval();
|
||||||
ppLogInfo("Open GL Swap Interval %d", value);
|
ppLogInfo("Open GL Swap Interval %d", value);
|
||||||
QGLFormat::setDefaultFormat(fmt);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < MAX_RECENT_FILES; ++i)
|
for (int i = 0; i < MAX_RECENT_FILES; ++i)
|
||||||
|
@ -80,6 +79,13 @@ QtWindow::QtWindow()
|
||||||
set_realtime_priority(SCHED_FIFO, rt_prio);
|
set_realtime_priority(SCHED_FIFO, rt_prio);
|
||||||
#endif
|
#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 = new CGLView(this, m_settings);
|
||||||
m_glWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
m_glWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user