80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2217 from ts-korhonen/qt-opengl

Browse Source 
qt: Fix shaders on HD4000/4400
This commit is contained in:
Miran Grča
2022-03-13 01:01:43 +01:00
committed by GitHub
parent 910b59d4bb b1eeef7527
commit 607c499f96
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/qt_opengloptions.cpp
View File

@@ -14,6 +14,7 @@
* Copyright 2022 Teemu Korhonen * Copyright 2022 Teemu Korhonen
*/ */
#include <QByteArray>
#include <QFile> #include <QFile>
#include <QRegularExpression> #include <QRegularExpression>
#include <QStringBuilder> #include <QStringBuilder>
@@ -89,7 +90,7 @@ OpenGLOptions::save() const
auto path = m_shaders.first().path().toLocal8Bit(); auto path = m_shaders.first().path().toLocal8Bit();
if (!path.isEmpty()) if (!path.isEmpty())
strcpy(video_shader, path.constData()); qstrncpy(video_shader, path.constData(), sizeof(video_shader));
else else
video_shader[0] = '\0'; video_shader[0] = '\0';
} }
@@ -144,6 +145,9 @@ OpenGLOptions::addShader(const QString &path)
shader_file.close(); shader_file.close();
/* Remove parameter lines */
shader_text.remove(QRegularExpression("^\\s*#pragma parameter.*?\\n", QRegularExpression::MultilineOption));
QRegularExpression version("^\\s*(#version\\s+\\w+)", QRegularExpression::MultilineOption); QRegularExpression version("^\\s*(#version\\s+\\w+)", QRegularExpression::MultilineOption);
auto match = version.match(shader_text); auto match = version.match(shader_text);