Skip to content

Commit 7c124e9

Browse files
committed
feat(video): register brightness filter in W3DShaderManager
1 parent c98afb4 commit 7c124e9

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
#include "W3DDevice/GameClient/W3DShroud.h"
6363
#include "W3DDevice/GameClient/HeightMap.h"
6464
#include "W3DDevice/GameClient/W3DCustomScene.h"
65+
#include "W3DDevice/GameClient/W3DBrightnessFilter.h"
6566
#include "GameClient/View.h"
6667
#include "GameClient/CommandXlat.h"
6768
#include "GameClient/Display.h"
@@ -129,6 +130,20 @@ W3DFilterInterface *ScreenBWFilterList[]=
129130
NULL
130131
};
131132

133+
/*========= ScreenBrightnessFilter =============================================================*/
134+
///applies brightness/gamma adjustment to viewport.
135+
136+
ScreenBrightnessFilter screenBrightnessFilter;
137+
ScreenBrightnessFilterFixedFunction screenBrightnessFilterFixedFunction; //fallback version for cards without pixel shaders.
138+
139+
///List of different Brightness shader implementations in order of preference
140+
W3DFilterInterface *ScreenBrightnessFilterList[]=
141+
{
142+
&screenBrightnessFilter,
143+
&screenBrightnessFilterFixedFunction, //fallback version for cards without pixel shaders.
144+
NULL
145+
};
146+
132147
Int ScreenBWFilter::init(void)
133148
{
134149
Int res;
@@ -2304,6 +2319,7 @@ W3DFilterInterface **MasterFilterList[]=
23042319
ScreenBWFilterList,
23052320
ScreenMotionBlurFilterList,
23062321
ScreenCrossFadeFilterList,
2322+
ScreenBrightnessFilterList,
23072323
NULL
23082324
};
23092325

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
#include "W3DDevice/GameClient/HeightMap.h"
6464
#include "W3DDevice/GameClient/W3DCustomScene.h"
6565
#include "W3DDevice/GameClient/W3DSmudge.h"
66+
#include "W3DDevice/GameClient/W3DBrightnessFilter.h"
6667
#include "GameClient/View.h"
6768
#include "GameClient/CommandXlat.h"
6869
#include "GameClient/Display.h"
@@ -140,6 +141,20 @@ W3DFilterInterface *ScreenDefaultFilterList[]=
140141
NULL
141142
};
142143

144+
/*========= ScreenBrightnessFilter =============================================================*/
145+
///applies brightness/gamma adjustment to viewport.
146+
147+
ScreenBrightnessFilter screenBrightnessFilter;
148+
ScreenBrightnessFilterFixedFunction screenBrightnessFilterFixedFunction; //fallback version for cards without pixel shaders.
149+
150+
///List of different Brightness shader implementations in order of preference
151+
W3DFilterInterface *ScreenBrightnessFilterList[]=
152+
{
153+
&screenBrightnessFilter,
154+
&screenBrightnessFilterFixedFunction, //fallback version for cards without pixel shaders.
155+
NULL
156+
};
157+
143158
Int ScreenDefaultFilter::init(void)
144159
{
145160
if (!W3DShaderManager::canRenderToTexture()) {
@@ -2558,6 +2573,7 @@ W3DFilterInterface **MasterFilterList[]=
25582573
ScreenBWFilterList,
25592574
ScreenMotionBlurFilterList,
25602575
ScreenCrossFadeFilterList,
2576+
ScreenBrightnessFilterList,
25612577
NULL
25622578
};
25632579

0 commit comments

Comments
 (0)