Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

steamcompmgr: Fix setting lut override multiple times

Browse source
This commit is contained in:
Joshua Ashton 2023-04-03 21:27:55 +01:00 committed by Joshie
parent 15014f401e
commit 90de845cfc
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rendervulkan.hpp
View file

@ -342,7 +342,7 @@ using mat3x4 = std::array<std::array<float, 4>, 3>;
struct gamescope_color_mgmt_t
{
bool enabled;
bool hasOverrides;
uint32_t externalDirtyCtr;
nightmode_t nightmode;
float sdrGamutWideness; // user property to widen gamut
displaycolorimetry_t nativeDisplayColorimetry;

20
src/steamcompmgr.cpp
View file

@ -145,7 +145,7 @@ update_color_mgmt()
EOTF planeEOTF = static_cast<EOTF>( i );
calcColorTransform( &lut1d[0], nLutSize1d, &lut3d[0], nLutEdgeSize3d, syntheticInputColorimetry, nativeDisplayOutput, syntheticInputColorMapping, g_ColorMgmt.pending.nightmode, planeEOTF );
if ( g_ColorMgmt.pending.hasOverrides )
if ( !g_ColorMgmtLutsOverride[i].lut3d.empty() && !g_ColorMgmtLutsOverride[i].lut3d.empty() )
g_ColorMgmtLuts[i] = g_ColorMgmtLutsOverride[i];
else if ( !lut3d.empty() && !lut1d.empty() )
g_ColorMgmtLuts[i] = gamescope_color_mgmt_luts{ lut3d, lut1d };
@ -195,14 +195,12 @@ bool set_color_mgmt_enabled( bool bEnabled )
bool set_color_3dlut_override(const char *path)
{
bool had_lut = !g_ColorMgmtLutsOverride[1].lut3d.empty();
g_ColorMgmtLutsOverride[1].lut3d.clear();
g_ColorMgmt.pending.hasOverrides = !g_ColorMgmtLutsOverride[1].lut1d.empty() && !g_ColorMgmtLutsOverride[1].lut3d.empty();
g_ColorMgmt.pending.externalDirtyCtr++;
FILE *f = fopen(path, "rb");
if (!f) {
return had_lut;
return true;
}
fseek(f, 0, SEEK_END);
@ -212,28 +210,25 @@ bool set_color_3dlut_override(const char *path)
size_t elems = fsize / sizeof(uint16_t);
if (elems == 0) {
return had_lut;
return true;
}
auto data = std::vector<uint16_t>(elems);
fread(data.data(), elems, sizeof(uint16_t), f);
g_ColorMgmtLutsOverride[1].lut3d = std::move(data);
g_ColorMgmt.pending.hasOverrides = !g_ColorMgmtLutsOverride[1].lut1d.empty() && !g_ColorMgmtLutsOverride[1].lut3d.empty();
return true;
}
bool set_color_shaperlut_override(const char *path)
{
bool had_lut = !g_ColorMgmtLutsOverride[1].lut1d.empty();
g_ColorMgmtLutsOverride[1].lut1d.clear();
g_ColorMgmt.pending.hasOverrides = !g_ColorMgmtLutsOverride[1].lut1d.empty() && !g_ColorMgmtLutsOverride[1].lut3d.empty();
g_ColorMgmt.pending.externalDirtyCtr++;
FILE *f = fopen(path, "rb");
if (!f) {
return had_lut;
return true;
}
fseek(f, 0, SEEK_END);
@ -243,14 +238,13 @@ bool set_color_shaperlut_override(const char *path)
size_t elems = fsize / sizeof(uint16_t);
if (elems == 0) {
return had_lut;
return true;
}
auto data = std::vector<uint16_t>(elems);
fread(data.data(), elems, sizeof(uint16_t), f);
g_ColorMgmtLutsOverride[1].lut1d = std::move(data);
g_ColorMgmt.pending.hasOverrides = !g_ColorMgmtLutsOverride[1].lut1d.empty() && !g_ColorMgmtLutsOverride[1].lut3d.empty();
return true;
}