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.

3f4b8423

Commit 3f4b8423 authored 3 years ago by Ptolemy

Downloads
- Patches
- Plain Diff

SL-14113: Merge duplicate shader constant for clarity.

parent e371fdbf

No related branches found

No related tags found

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

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

indra/llrender/llglslshader.cpp
indra/llrender/llglslshader.h 2 additions, 3 deletions

indra/llrender/llglslshader.h
indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl 1 addition, 1 deletion

...newview/app_settings/shaders/class1/deferred/cloudsF.glsl
indra/newview/app_settings/shaders/class1/deferred/moonF.glsl 1 addition, 1 deletion

...a/newview/app_settings/shaders/class1/deferred/moonF.glsl
indra/newview/app_settings/shaders/class1/environment/moonF.glsl 1 addition, 1 deletion

...ewview/app_settings/shaders/class1/environment/moonF.glsl
indra/newview/app_settings/shaders/class1/windlight/moonF.glsl 1 addition, 1 deletion

.../newview/app_settings/shaders/class1/windlight/moonF.glsl
indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl 1 addition, 1 deletion

...ewview/app_settings/shaders/class2/windlight/cloudsF.glsl
indra/newview/llviewershadermgr.cpp 5 additions, 5 deletions

indra/newview/llviewershadermgr.cpp

with 17 additions and 20 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