diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-24 15:32:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-24 15:32:58 -0500 |
| commit | e2b52009ea509ec67341df196f3ad629869493e1 (patch) | |
| tree | 65089b4903f6169f46333156d965609735f0a3dd /indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl | |
| parent | 8d410326c937a375fa0eb7855678e590499a79d2 (diff) | |
| parent | 7b83f1dfd1daeb4e0b80e1c369e83137682a723c (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl index 34e30a3070..c275434777 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl @@ -1,5 +1,5 @@ /** - * @file postDeferredF.glsl + * @file postDeferredNoDoFF.glsl * * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * Second Life Viewer Source Code @@ -23,15 +23,17 @@ * $/LicenseInfo$ */ - - #extension GL_ARB_texture_rectangle : enable +#ifdef DEFINE_GL_FRAGCOLOR +out vec4 gl_FragColor; +#endif + uniform sampler2DRect diffuseRect; uniform sampler2D bloomMap; uniform vec2 screen_res; -varying vec2 vary_fragcoord; +VARYING vec2 vary_fragcoord; void main() { @@ -40,3 +42,4 @@ void main() vec4 bloom = texture2D(bloomMap, vary_fragcoord.xy/screen_res); gl_FragColor = diff + bloom; } + |