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.

964f9e74

Commit 964f9e74 authored 1 year ago by David Parks

Downloads
- Patches
- Plain Diff

SL-20611 followup -- remove now unused glsl files. Fix transparent water.

parent bdb53fd5

No related branches found

No related tags found

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

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llglslshader.h 0 additions, 1 deletion

indra/llrender/llglslshader.h
indra/llrender/llshadermgr.cpp 16 additions, 58 deletions

indra/llrender/llshadermgr.cpp
indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl 0 additions, 51 deletions

...ettings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl
indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl 0 additions, 55 deletions

...aders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl
indra/newview/app_settings/shaders/class1/lighting/lightWaterF.glsl 0 additions, 42 deletions

...iew/app_settings/shaders/class1/lighting/lightWaterF.glsl
indra/newview/app_settings/shaders/class1/lighting/lightWaterNonIndexedF.glsl 0 additions, 44 deletions

...ttings/shaders/class1/lighting/lightWaterNonIndexedF.glsl
indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl 0 additions, 33 deletions

...iew/app_settings/shaders/class1/objects/simpleWaterF.glsl
indra/newview/app_settings/shaders/class3/environment/waterF.glsl 1 addition, 1 deletion

...wview/app_settings/shaders/class3/environment/waterF.glsl
indra/newview/llviewershadermgr.cpp 1 addition, 13 deletions

indra/newview/llviewershadermgr.cpp

with 18 additions and 298 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