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.

423fa1ac

Commit 423fa1ac authored 6 years ago by Graham Linden

Downloads
- Patches
- Plain Diff

SL-10618, SL-10698

Fix reflection/distortion map culling planes again.

Fix broken handling of shadow disables in ALM forward shaders.

parent f488e585

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llglslshader.cpp 5 additions, 0 deletions

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

indra/llrender/llglslshader.h
indra/llrender/llshadermgr.cpp 1 addition, 6 deletions

indra/llrender/llshadermgr.cpp
indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl 7 additions, 16 deletions

.../newview/app_settings/shaders/class1/deferred/alphaF.glsl
indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl 2 additions, 2 deletions

...iew/app_settings/shaders/class1/deferred/fullbrightF.glsl
indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl 2 additions, 2 deletions

...pp_settings/shaders/class1/deferred/fullbrightShinyF.glsl
indra/newview/app_settings/shaders/class1/deferred/materialF.glsl 13 additions, 21 deletions

...wview/app_settings/shaders/class1/deferred/materialF.glsl
indra/newview/app_settings/shaders/class1/deferred/materialV.glsl 11 additions, 11 deletions

...wview/app_settings/shaders/class1/deferred/materialV.glsl
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl 0 additions, 15 deletions

...ew/app_settings/shaders/class1/deferred/softenLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/waterF.glsl 0 additions, 2 deletions

.../newview/app_settings/shaders/class1/deferred/waterF.glsl
indra/newview/llviewershadermgr.cpp 80 additions, 18 deletions

indra/newview/llviewershadermgr.cpp
indra/newview/pipeline.cpp 67 additions, 31 deletions

indra/newview/pipeline.cpp
indra/newview/pipeline.h 1 addition, 0 deletions

indra/newview/pipeline.h

with 190 additions and 124 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