Merge pull request #2204 from ts-korhonen/qt-opengl
qt: opengl core; fix filter method defaulting to nearest
This commit is contained in:
@@ -49,6 +49,10 @@ OpenGLOptions::OpenGLOptions(QObject *parent, bool loadConfig, const QString &gl
|
|||||||
: QObject(parent)
|
: QObject(parent)
|
||||||
, m_glslVersion(glslVersion)
|
, m_glslVersion(glslVersion)
|
||||||
{
|
{
|
||||||
|
m_filter = video_filter_method == 0
|
||||||
|
? FilterType::Nearest
|
||||||
|
: FilterType::Linear;
|
||||||
|
|
||||||
if (!loadConfig)
|
if (!loadConfig)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -60,10 +64,6 @@ OpenGLOptions::OpenGLOptions(QObject *parent, bool loadConfig, const QString &gl
|
|||||||
? RenderBehaviorType::SyncWithVideo
|
? RenderBehaviorType::SyncWithVideo
|
||||||
: RenderBehaviorType::TargetFramerate;
|
: RenderBehaviorType::TargetFramerate;
|
||||||
|
|
||||||
m_filter = video_filter_method == 0
|
|
||||||
? FilterType::Nearest
|
|
||||||
: FilterType::Linear;
|
|
||||||
|
|
||||||
QString shaderPath(video_shader);
|
QString shaderPath(video_shader);
|
||||||
|
|
||||||
if (shaderPath.isEmpty()) {
|
if (shaderPath.isEmpty()) {
|
||||||
|
Reference in New Issue
Block a user