OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Simplify FGLRenderer::PostProcessScene

Browse source
This commit is contained in:
Magnus Norddahl 2018-06-29 21:55:46 +02:00
commit ecb5d69ae3
6 changed files with 289 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/hwrenderer/postprocessing/hw_postprocess.cpp
View file

@ -6,6 +6,24 @@
Postprocess hw_postprocess;
Postprocess::Postprocess()
{
Managers.Push(new PPBloom());
Managers.Push(new PPLensDistort());
Managers.Push(new PPFXAA());
Managers.Push(new PPCameraExposure());
Managers.Push(new PPColormap());
Managers.Push(new PPTonemap());
}
Postprocess::~Postprocess()
{
for (unsigned int i = 0; i < Managers.Size(); i++)
delete Managers[i];
}
/////////////////////////////////////////////////////////////////////////////
void PPBloom::DeclareShaders()
{
hw_postprocess.Shaders["BloomCombine"] = { "shaders/glsl/bloomcombine.fp", "", {} };
@ -14,8 +32,11 @@ void PPBloom::DeclareShaders()
hw_postprocess.Shaders["BlurHorizontal"] = { "shaders/glsl/blur.fp", "#define BLUR_HORIZONTAL\n", BlurUniforms::Desc() };
}
void PPBloom::UpdateTextures(int width, int height)
void PPBloom::UpdateTextures()
{
int width = hw_postprocess.SceneWidth;
int height = hw_postprocess.SceneHeight;
// No scene, no bloom!
if (width <= 0 || height <= 0)
return;
@ -42,10 +63,12 @@ void PPBloom::UpdateTextures(int width, int height)
}
}
void PPBloom::UpdateSteps(int fixedcm)
void PPBloom::UpdateSteps()
{
UpdateBlurSteps();
// Only bloom things if enabled and no special fixed light mode is active
if (!gl_bloom || fixedcm != CM_DEFAULT || gl_ssao_debug)
if (!gl_bloom || hw_postprocess.fixedcm != CM_DEFAULT || gl_ssao_debug || hw_postprocess.SceneWidth <= 0 || hw_postprocess.SceneHeight <= 0)
{
hw_postprocess.Effects["BloomScene"] = {};
return;
@ -117,14 +140,14 @@ void PPBloom::UpdateSteps(int fixedcm)
hw_postprocess.Effects["BloomScene"] = steps;
}
void PPBloom::UpdateBlurSteps(float gameinfobluramount)
void PPBloom::UpdateBlurSteps()
{
// first, respect the CVar
float blurAmount = gl_menu_blur;
// if CVar is negative, use the gameinfo entry
if (gl_menu_blur < 0)
blurAmount = gameinfobluramount;
blurAmount = hw_postprocess.gameinfobluramount;
// if blurAmount == 0 or somehow still returns negative, exit to prevent a crash, clearly we don't want this
if (blurAmount <= 0.0)
@ -377,8 +400,11 @@ void PPCameraExposure::DeclareShaders()
hw_postprocess.Shaders["ExposureCombine"] = { "shaders/glsl/exposurecombine.fp", "", ExposureCombineUniforms::Desc() };
}
void PPCameraExposure::UpdateTextures(int width, int height)
void PPCameraExposure::UpdateTextures()
{
int width = hw_postprocess.SceneWidth;
int height = hw_postprocess.SceneHeight;
if (ExposureLevels.Size() > 0 && ExposureLevels[0].Viewport.width == width && ExposureLevels[0].Viewport.height == height)
{
return;
@ -486,8 +512,10 @@ void PPColormap::DeclareShaders()
hw_postprocess.Shaders["Colormap"] = { "shaders/glsl/colormap.fp", "", ColormapUniforms::Desc() };
}
void PPColormap::UpdateSteps(int fixedcm)
void PPColormap::UpdateSteps()
{
int fixedcm = hw_postprocess.fixedcm;
if (fixedcm < CM_FIRSTSPECIALCOLORMAP || fixedcm >= CM_MAXCOLORMAP)
{
hw_postprocess.Effects["ColormapScene"] = {};

67
src/hwrenderer/postprocessing/hw_postprocess.h
View file

@ -201,12 +201,34 @@ public:
int Version = 330;
};
class PPEffectManager
{
public:
virtual void DeclareShaders() { }
virtual void UpdateTextures() { }
virtual void UpdateSteps() { }
};
class Postprocess
{
public:
Postprocess();
~Postprocess();
void DeclareShaders() { for (unsigned int i = 0; i < Managers.Size(); i++) Managers[i]->DeclareShaders(); }
void UpdateTextures() { for (unsigned int i = 0; i < Managers.Size(); i++) Managers[i]->UpdateTextures(); }
void UpdateSteps() { for (unsigned int i = 0; i < Managers.Size(); i++) Managers[i]->UpdateSteps(); }
int SceneWidth = 0;
int SceneHeight = 0;
int fixedcm;
float gameinfobluramount;
TMap<FString, TArray<PPStep>> Effects;
TMap<FString, PPTextureDesc> Textures;
TMap<FString, PPShader> Shaders;
TArray<PPEffectManager*> Managers;
};
extern Postprocess hw_postprocess;
@ -258,15 +280,16 @@ public:
PPTextureName HTexture;
};
class PPBloom
class PPBloom : public PPEffectManager
{
public:
void DeclareShaders();
void UpdateTextures(int sceneWidth, int sceneHeight);
void UpdateSteps(int fixedcm);
void UpdateBlurSteps(float gameinfobluramount);
void DeclareShaders() override;
void UpdateTextures() override;
void UpdateSteps() override;
private:
void UpdateBlurSteps();
PPStep BlurStep(const BlurUniforms &blurUniforms, PPTextureName input, PPTextureName output, PPViewport viewport, bool vertical);
static float ComputeBlurGaussian(float n, float theta);
@ -299,11 +322,11 @@ struct LensUniforms
}
};
class PPLensDistort
class PPLensDistort : public PPEffectManager
{
public:
void DeclareShaders();
void UpdateSteps();
void DeclareShaders() override;
void UpdateSteps() override;
};
/////////////////////////////////////////////////////////////////////////////
@ -324,11 +347,11 @@ struct FXAAUniforms
}
};
class PPFXAA
class PPFXAA : public PPEffectManager
{
public:
void DeclareShaders();
void UpdateSteps();
void DeclareShaders() override;
void UpdateSteps() override;
private:
int GetMaxVersion();
@ -378,12 +401,12 @@ public:
PPTextureName Texture;
};
class PPCameraExposure
class PPCameraExposure : public PPEffectManager
{
public:
void DeclareShaders();
void UpdateTextures(int sceneWidth, int sceneHeight);
void UpdateSteps();
void DeclareShaders() override;
void UpdateTextures() override;
void UpdateSteps() override;
private:
TArray<PPExposureLevel> ExposureLevels;
@ -407,21 +430,21 @@ struct ColormapUniforms
}
};
class PPColormap
class PPColormap : public PPEffectManager
{
public:
void DeclareShaders();
void UpdateSteps(int fixedcm);
void DeclareShaders() override;
void UpdateSteps() override;
};
/////////////////////////////////////////////////////////////////////////////
class PPTonemap
class PPTonemap : public PPEffectManager
{
public:
void DeclareShaders();
void UpdateTextures();
void UpdateSteps();
void DeclareShaders() override;
void UpdateTextures() override;
void UpdateSteps() override;
enum TonemapMode
{