Skip to content

Commit

Permalink
format corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
DestinyXZ9 committed Apr 12, 2024
1 parent 2d700a0 commit 667afd2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/platform/core/src/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void PlatformConfig::Load(std::string const& path) {
{ "linear", Video::Filter::Linear },
{ "sharp", Video::Filter::Sharp },
{ "xbrz", Video::Filter::xBRZ },
{ "lcd1x", Video::Filter::Lcd1x },
{ "lcd1x", Video::Filter::Lcd1x }

};

Expand Down
6 changes: 3 additions & 3 deletions src/platform/core/src/device/ogl_video_device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ void OGLVideoDevice::CreateShaderPrograms() {
// Sharp bilinear.
case Video::Filter::Sharp: {
auto [success, program] = CompileProgram(sharp_bilinear_vert, sharp_bilinear_frag);
if (success) {
if(success) {
shader_passes.push_back({program});
}
break;
}
// Lcd1x filter
case Video::Filter::Lcd1x:{
auto [success, program] = CompileProgram(lcd1x_vert, lcd1x_frag);
if (success) {
if(success) {
shader_passes.push_back({program});
}
break;
Expand Down Expand Up @@ -374,4 +374,4 @@ void OGLVideoDevice::Draw(u32* buffer) {
}
}

} // namespace nba
} // namespace nba
6 changes: 0 additions & 6 deletions src/platform/core/src/device/shader/lcd1x.glsl.hpp
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
/*
* lcd1x - Simple LCD 'scanline' shader, based on lcd3x
*
* Original code by Gigaherz, released into the public domain
*
* Ported to Nano Boy Advance format by Destiny
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* lcd1x differs from lcd3x in the following manner:
*
* Omits LCD-style colour separation
*
* Has 'correctly' aligned scanlines
*/

Expand Down
2 changes: 1 addition & 1 deletion src/platform/qt/src/widget/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void MainWindow::CreateVideoMenu(QMenu* parent) {
{ "Linear", nba::PlatformConfig::Video::Filter::Linear },
{ "Sharp", nba::PlatformConfig::Video::Filter::Sharp },
{ "xBRZ", nba::PlatformConfig::Video::Filter::xBRZ },
{ "Lcd1x", nba::PlatformConfig::Video::Filter::Lcd1x }
{ "Lcd1x", nba::PlatformConfig::Video::Filter::Lcd1x }
}, &config->video.filter, false, reload_config);

CreateSelectionOption(menu->addMenu(tr("Color correction")), {
Expand Down

0 comments on commit 667afd2

Please sign in to comment.