Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

XDG Integration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

f7f5f4ae

Commit f7f5f4ae authored 1 year ago by Rye Mutt

Downloads
- Plain Diff

Merge remote-tracking branch 'linden/DRTVWR-559' into cronchy

parents 2f80db55 733c5af1

No related branches found

No related tags found

2 merge requests!3Update to main branch,!2Rebase onto current main branch

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llshadermgr.cpp 8 additions, 1 deletion

indra/llrender/llshadermgr.cpp
indra/llrender/llshadermgr.h 7 additions, 0 deletions

indra/llrender/llshadermgr.h
indra/newview/app_settings/settings.xml 55 additions, 0 deletions

indra/newview/app_settings/settings.xml
indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl 1 addition, 1 deletion

...settings/shaders/class1/deferred/screenSpaceReflUtil.glsl
indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl 6 additions, 6 deletions

...pp_settings/shaders/class3/deferred/reflectionProbeF.glsl
indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflPostF.glsl 2 additions, 2 deletions

...ettings/shaders/class3/deferred/screenSpaceReflPostF.glsl
indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl 179 additions, 41 deletions

...settings/shaders/class3/deferred/screenSpaceReflUtil.glsl
indra/newview/lldrawpoolalpha.cpp 4 additions, 19 deletions

indra/newview/lldrawpoolalpha.cpp
indra/newview/llviewerwindow.cpp 1 addition, 0 deletions

indra/newview/llviewerwindow.cpp
indra/newview/pipeline.cpp 23 additions, 1 deletion

indra/newview/pipeline.cpp
indra/newview/pipeline.h 5 additions, 0 deletions

indra/newview/pipeline.h

with 291 additions and 71 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