zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-12 15:44:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- changed defaults

Browse source 
- moved CVARs to head of file as forward declaration
- FGLRenderer::BlurScene now checks if postprocessing is enabled before executing
This commit is contained in:
Rachael Alexanderson 2017-03-14 18:46:51 -04:00
parent e49b549364
commit 954f21f71d
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gl/renderer/gl_postprocess.cpp
View file

@ -145,6 +145,8 @@ CUSTOM_CVAR(Bool, gl_paltonemap_reverselookup, true, CVAR_ARCHIVE | CVAR_NOINITC
GLRenderer->ClearTonemapPalette(); GLRenderer->ClearTonemapPalette();
} }
CVAR(Float, gl_menu_blur, 1.0f, CVAR_ARCHIVE)
CVAR(Bool, gl_menu_blur_enabled, true, CVAR_ARCHIVE)
EXTERN_CVAR(Float, vid_brightness) EXTERN_CVAR(Float, vid_brightness)
EXTERN_CVAR(Float, vid_contrast) EXTERN_CVAR(Float, vid_contrast)
@ -166,7 +168,6 @@ void FGLRenderer::PostProcessScene(int fixedcm)
ColormapScene(fixedcm); ColormapScene(fixedcm);
LensDistortScene(); LensDistortScene();
ApplyFXAA(); ApplyFXAA();
//BlurScene();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -474,19 +475,17 @@ void FGLRenderer::BloomScene(int fixedcm)
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
CVAR(Float, gl_menu_blur, 5.0f, CVAR_ARCHIVE)
CVAR(Bool, gl_menu_blur_enabled, false, CVAR_ARCHIVE)
void FGLRenderer::BlurScene() void FGLRenderer::BlurScene()
{ {
if ((!gl_menu_blur_enabled) || (gl_menu_blur <= 0.0)) float blurAmount = gl_menu_blur;
if ((!gl_menu_blur_enabled) || (gl_menu_blur <= 0.0) || !FGLRenderBuffers::IsEnabled())
return; return;
FGLDebug::PushGroup("BlurScene"); FGLDebug::PushGroup("BlurScene");
FGLPostProcessState savedState; FGLPostProcessState savedState;
savedState.SaveTextureBindings(2); savedState.SaveTextureBindings(2);
const float blurAmount = gl_menu_blur;
int sampleCount = 9; int sampleCount = 9;
int numLevels = 3; // Must be 4 or less (since FGLRenderBuffers::NumBloomLevels is 4 and we are using its buffers). int numLevels = 3; // Must be 4 or less (since FGLRenderBuffers::NumBloomLevels is 4 and we are using its buffers).
assert(numLevels <= FGLRenderBuffers::NumBloomLevels); assert(numLevels <= FGLRenderBuffers::NumBloomLevels);