Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package Registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

6525fc4a

Commit 6525fc4a authored 12 years ago by Oz Linden

Downloads
- Plain Diff

merge changes for DRTVWR-147

parents bdd17086 b6f2b2f3

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

doc/contributions.txt 1 addition, 1 deletion

doc/contributions.txt
indra/llrender/llshadermgr.cpp 2 additions, 1 deletion

indra/llrender/llshadermgr.cpp
indra/llrender/llshadermgr.h 1 addition, 0 deletions

indra/llrender/llshadermgr.h
indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl 13 additions, 5 deletions

...pp_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl
indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskV.glsl 9 additions, 3 deletions

...pp_settings/shaders/class1/deferred/shadowAlphaMaskV.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl 13 additions, 11 deletions

.../newview/app_settings/shaders/class2/deferred/alphaF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl 13 additions, 11 deletions

...pp_settings/shaders/class2/deferred/alphaNonIndexedF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl 13 additions, 11 deletions

...ings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl 25 additions, 25 deletions

...wview/app_settings/shaders/class2/deferred/sunLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl 26 additions, 26 deletions

...w/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl
indra/newview/pipeline.cpp 13 additions, 6 deletions

indra/newview/pipeline.cpp
indra/newview/pipeline.h 1 addition, 1 deletion

indra/newview/pipeline.h

with 130 additions and 101 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment