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.

4f2c2597

Commit 4f2c2597 authored 11 years ago by Graham Linden

Downloads
- Plain Diff

Merge vwr-dev-mat

parents c262ef58 418c8a72

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 1 addition, 0 deletions

.hgtags
indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletion

indra/newview/VIEWER_VERSION.txt
indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl 1 addition, 1 deletion

.../newview/app_settings/shaders/class1/deferred/alphaF.glsl
indra/newview/app_settings/shaders/class1/deferred/materialF.glsl 1 addition, 1 deletion

...wview/app_settings/shaders/class1/deferred/materialF.glsl
indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl 38 additions, 53 deletions

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl 4 additions, 0 deletions

...app_settings/shaders/class2/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl 4 additions, 1 deletion

...view/app_settings/shaders/class2/deferred/spotLightF.glsl
indra/newview/featuretable_mac.txt 2 additions, 2 deletions

indra/newview/featuretable_mac.txt
indra/newview/llviewershadermgr.cpp 16 additions, 10 deletions

indra/newview/llviewershadermgr.cpp
indra/newview/llviewershadermgr.h 3 additions, 1 deletion

indra/newview/llviewershadermgr.h
indra/newview/pipeline.cpp 13 additions, 27 deletions

indra/newview/pipeline.cpp

with 84 additions and 97 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