Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Core/Config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ static ConfigSetting generalSettings[] = {
ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true),
ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""),
ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false),
ConfigSetting("HideOnScreenMessage", &g_Config.bHideOnScreenMessage, false),
ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true),
ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion),
ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true),
Expand Down
1 change: 1 addition & 0 deletions Core/Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ struct Config {

// UI
bool bShowDebuggerOnLoad;
bool bHideOnScreenMessage;
int iShowFPSCounter;
bool bShowRegionOnGameIcon;
bool bShowIDOnGameIcon;
Expand Down
5 changes: 5 additions & 0 deletions UI/OnScreenDisplay.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "UI/OnScreenDisplay.h"

#include "Core/Config.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Render/DrawBuffer.h"
Expand Down Expand Up @@ -56,6 +57,10 @@ void OnScreenMessages::Clean() {
}

void OnScreenMessages::Show(const std::string &text, float duration_s, uint32_t color, int icon, bool checkUnique, const char *id) {
if (g_Config.bHideOnScreenMessage) {
return;
}

double now = time_now_d();
std::lock_guard<std::mutex> guard(mutex_);
if (checkUnique) {
Expand Down
5 changes: 5 additions & 0 deletions assets/shaders/defaultshaders.ini
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ SettingDefaultValue4=1.0
SettingMaxValue4=2.0
SettingMinValue4=0.1
SettingStep4=0.05
[PSPColor]
Name=PSP Color
Author=hunterk, Pokefan531 (ported by jdgleaver)
Fragment=psp_color.fsh
Vertex=fxaa.vsh
[Tex4xBRZ]
Type=Texture
Name=4xBRZ
Expand Down
2 changes: 1 addition & 1 deletion assets/shaders/psp_color.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void main()
{
// Apply colour correction
vec3 screen = pow(texture2D(sampler0, v_texcoord0.xy).rgb, vec3(target_gamma));
screen = clamp(screen, 0.0, 1.0);
// screen = clamp(screen, 0.0, 1.0);
screen = pow(
mat3(r, rg, rb,
gr, g, gb,
Expand Down
6 changes: 0 additions & 6 deletions assets/shaders/psp_color.ini

This file was deleted.

23 changes: 0 additions & 23 deletions assets/shaders/psp_color.vsh

This file was deleted.