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.

93a02596

Commit 93a02596 authored 2 years ago by David Parks

Downloads
- Patches
- Plain Diff

SL-17282 prototype mixing of reflection map into legacy materials

parent deffbca3

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llcubemap.cpp 6 additions, 2 deletions

indra/llrender/llcubemap.cpp
indra/llrender/llglslshader.cpp 17 additions, 1 deletion

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

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

indra/llrender/llshadermgr.h
indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl 0 additions, 1 deletion

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl 0 additions, 1 deletion

...app_settings/shaders/class1/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl 0 additions, 1 deletion

...iew/app_settings/shaders/class1/deferred/pointLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl 20 additions, 1 deletion

...ew/app_settings/shaders/class2/deferred/softenLightF.glsl
indra/newview/llenvironmentmap.cpp 1 addition, 1 deletion

indra/newview/llenvironmentmap.cpp
indra/newview/pipeline.cpp 37 additions, 8 deletions

indra/newview/pipeline.cpp

with 83 additions and 16 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