Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

StdGL: Move gamma calculation to shaders if shaders are enabled #93

Merged
merged 17 commits into from
Sep 10, 2024
Merged

StdGL: Move gamma calculation to shaders if shaders are enabled #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d332e5f
StdGL: Move gamma calculation to shaders if shaders are enabled
Fulgen301 Oct 29, 2022
21124aa
Only use gamma if Graphics.DisableGamma == false
Fulgen301 Oct 29, 2022
b898c67
Implement DisableGamma and EnableGamma properly
Fulgen301 Nov 2, 2022
9aab396
Check whether the gamma texture was created successfully
Fulgen301 Nov 2, 2022
897a8f5
CStdGLTexture: Remove 3D texture support
Fulgen301 Nov 3, 2022
d0a85da
DummyShader: Fix gamma texture sampling
Fulgen301 Nov 3, 2022
bf718cb
Use GL_NEAREST for the gamma texture
Fulgen301 Nov 3, 2022
d13eaa1
Revert "CStdGLTexture: Remove 3D texture support"
Fulgen301 Nov 3, 2022
e392e71
CStdGLTexture: Refactor, add support for 1D textures
Fulgen301 Nov 3, 2022
aa7f287
Use three 1D textures
Fulgen301 Nov 3, 2022
b925251
CStdShaderProgram: Move validation from Link into its own function to…
Fulgen301 Nov 3, 2022
4ec39dc
Don't read from gl_FragColor in DummyShader
Fulgen301 Oct 3, 2023
84c8229
Add Graphics.UseShaderGamma to control whether shader-based gamma cor…
Fulgen301 Sep 9, 2024
4d77656
CStdTexture: Fix Clear() not setting texture to GL_NONE
Fulgen301 Sep 9, 2024
ee66f00
CStdGL: Make InvalidateDeviceObjects / RestoreDeviceObjects work with…
Fulgen301 Sep 9, 2024
f1cc217
CStdGL: Remove leftover debug message callback
Fulgen301 Sep 9, 2024
78bf2c6
CStdGL: Remove duplicate call to InvalidateObjects()
Fulgen301 Sep 9, 2024
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 src/C4Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ void C4ConfigGraphics::CompileFunc(StdCompiler *pComp)
#endif

pComp->Value(mkNamingAdapt(ShowFolderMaps, "ShowFolderMaps", true));
pComp->Value(mkNamingAdapt(UseShaderGamma, "UseShaderGamma", true));
}

void C4ConfigSound::CompileFunc(StdCompiler *pComp)
Expand Down
1 change: 1 addition & 0 deletions src/C4Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ class C4ConfigGraphics
int PositionY;
#endif
bool ShowFolderMaps; // if true, folder maps are shown
bool UseShaderGamma; // whether to use shader-based gamma correction

void CompileFunc(StdCompiler *pComp);
};
Expand Down
2 changes: 1 addition & 1 deletion src/C4Game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2099,7 +2099,7 @@ bool C4Game::SaveGameTitle(C4Group &hGroup)
0.0f, 0.0f, float(Application.DDraw->lpBack->Wdt), float(Application.DDraw->lpBack->Hgt),
surface.get(), 0, 0, surfaceWidth, surfaceHeight);

if (!surface->SavePNG(Config.AtTempPath(C4CFN_TempTitle), false, true, false))
if (!surface->SavePNG(Config.AtTempPath(C4CFN_TempTitle), false, !Config.Graphics.Shader, false))
{
return false;
}
Expand Down
7 changes: 5 additions & 2 deletions src/C4GraphicsSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,10 @@ bool C4GraphicsSystem::DoSaveScreenshot(bool fSaveAll, const char *szFilename)
// transfer each pixel - slooow...
for (int32_t iY2 = 0; iY2 < bkHgt2; ++iY2)
for (int32_t iX2 = 0; iX2 < bkWdt2; ++iX2)
bmp.SetPixel24(iRealX + iX2, iRealY + iY2, Application.DDraw->ApplyGammaTo(Application.DDraw->lpBack->GetPixDw(iX2, iY2, false, scale)));
{
const std::uint32_t pixel{Application.DDraw->lpBack->GetPixDw(iX2, iY2, false, scale)};
bmp.SetPixel24(iRealX + iX2, iRealY + iY2, Config.Graphics.Shader ? pixel : Application.DDraw->ApplyGammaTo(pixel));
}
// done; unlock
Application.DDraw->lpBack->Unlock();
}
Expand All @@ -597,7 +600,7 @@ bool C4GraphicsSystem::DoSaveScreenshot(bool fSaveAll, const char *szFilename)
return true;
}
// Save primary surface
return Application.DDraw->lpBack->SavePNG(szFilename, false, true, false, scale);
return Application.DDraw->lpBack->SavePNG(szFilename, false, !Config.Graphics.Shader, false, scale);
}

void C4GraphicsSystem::DeactivateDebugOutput()
Expand Down
1 change: 1 addition & 0 deletions src/StdDDraw2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ class CStdShaderProgram
bool AddShader(CStdShader *shader);

virtual void Link() = 0;
virtual void Validate() = 0;
void Select();
static void Deselect();
virtual void Clear();
Expand Down
Loading
Loading