mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

clang-format fix

Browse source
This commit is contained in:
B3n30 2020-05-04 12:14:40 +02:00
parent 922a5f738a
commit ed48f8accf
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/citra/config.cpp
View file

@ -115,7 +115,8 @@ void Config::ReadValues() {
// Separable shader is broken on macos with Intel GPU thanks to poor drivers. // Separable shader is broken on macos with Intel GPU thanks to poor drivers.
// We still want to provide this option for test/development purposes, but disable it by // We still want to provide this option for test/development purposes, but disable it by
// default. // default.
Settings::values.separable_shader = sdl2_config->GetBoolean("Renderer", "separable_shader", false); Settings::values.separable_shader =
sdl2_config->GetBoolean("Renderer", "separable_shader", false);
#endif #endif
Settings::values.shaders_accurate_mul = Settings::values.shaders_accurate_mul =
sdl2_config->GetBoolean("Renderer", "shaders_accurate_mul", false); sdl2_config->GetBoolean("Renderer", "shaders_accurate_mul", false);

5
src/citra_qt/configuration/config.cpp
View file

@ -433,10 +433,11 @@ void Config::ReadRendererValues() {
ReadSetting(QStringLiteral("use_hw_renderer"), true).toBool(); ReadSetting(QStringLiteral("use_hw_renderer"), true).toBool();
Settings::values.use_hw_shader = ReadSetting(QStringLiteral("use_hw_shader"), true).toBool(); Settings::values.use_hw_shader = ReadSetting(QStringLiteral("use_hw_shader"), true).toBool();
#ifdef __APPLE__ #ifdef __APPLE__
// Hardware shader is broken on macos thanks to poor drivers. // Hardware shader is broken on macos with Intel GPUs thanks to poor drivers.
// We still want to provide this option for test/development purposes, but disable it by // We still want to provide this option for test/development purposes, but disable it by
// default. // default.
Settings::values.separable_shader = ReadSetting(QStringLiteral("separable_shader"), false).toBool(); Settings::values.separable_shader =
ReadSetting(QStringLiteral("separable_shader"), false).toBool();
#endif #endif
Settings::values.shaders_accurate_mul = Settings::values.shaders_accurate_mul =
ReadSetting(QStringLiteral("shaders_accurate_mul"), false).toBool(); ReadSetting(QStringLiteral("shaders_accurate_mul"), false).toBool();

3
src/citra_qt/configuration/configure_graphics.cpp
View file

@ -37,7 +37,8 @@ ConfigureGraphics::ConfigureGraphics(QWidget* parent)
if (state == Qt::Checked) { if (state == Qt::Checked) {
QMessageBox::warning( QMessageBox::warning(
this, tr("Hardware Shader Warning"), this, tr("Hardware Shader Warning"),
tr("Separable Shader support is broken on macOS with Intel GPUs, and will cause graphical issues " tr("Separable Shader support is broken on macOS with Intel GPUs, and will cause "
"graphical issues "
"like showing a black screen.<br><br>The option is only there for " "like showing a black screen.<br><br>The option is only there for "
"test/development purposes. If you experience graphical issues with Hardware " "test/development purposes. If you experience graphical issues with Hardware "
"Shader, please turn it off.")); "Shader, please turn it off."));