Lirusaito
c5329968f7
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer
...
# Conflicts:
# indra/llcommon/llstring.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
2019-03-18 17:30:34 -04:00
Lirusaito
bb26127ed5
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2019-03-18 14:38:21 -04:00
Shyotl
30f6dc2b2d
Allow more than 2gigs of texture memory... Fix shader buggles.
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2019-03-18 00:16:34 -05:00
Shyotl
e0194d4d06
Allow more than 2gigs of texture memory... Fix shader buggles.
2019-03-18 00:11:24 -05:00
Lirusaito
b71ee44505
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-17 00:22:55 -04:00
Shyotl
3a78568a6f
Intermediary commit #2 .
2019-03-16 21:35:33 -05:00
Shyotl
6c15ee6556
Fix texunit->uniform location mappings disaster inherited from upstream. Kudos to Drake for sharing the nvidia warning logs and bringing this to my attention.
2019-03-10 01:30:26 -06:00
Lirusaito
c37cb7b2c4
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-08 14:09:35 -05:00
Lirusaito
f8c8734e79
[PPE] Add SinguPostProcessDefault for setting active and persisting preset
2019-03-08 13:56:07 -05:00
Lirusaito
28e464f368
Code Clean up
2019-03-08 13:51:14 -05:00
Lirusaito
26a7de79c7
[PPE] Preset overrides go in user settings now
2019-03-08 13:50:06 -05:00
Shyotl
cd340f0fb6
Linux compilation fix.
2019-03-07 00:37:17 -06:00
Lirusaito
626351e897
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-06 21:32:29 -05:00
Shyotl
d176a58d33
Replace in file oopsie.
2019-03-06 19:41:32 -06:00
Lirusaito
88639c2052
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-06 17:10:33 -05:00
Lirusaito
cd02bbd1cb
Fix mixed iterators
...
Thanks Aru
2019-03-06 16:10:31 -05:00
Shyotl
5a7e0b05a4
Fixup texture compression.
2019-03-05 03:11:04 -06:00
Shyotl
6dc2e9e6df
Use proper symbol names
2019-03-04 11:12:20 -06:00
Shyotl
7317f28ab3
Clean up compressed texture handling. Exclude dynamic/client generated/local textures. Got rid of glh headers.
2019-03-04 02:03:45 -06:00
Lirusaito
58ba9e3617
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2019-03-02 19:01:49 -05:00
Shyotl
64931839cc
Add compression textbox. Don't compress local assets.
2019-03-02 03:47:48 -06:00
Shyotl
e1cf05c327
Enable compressed texture. Also minor cleanup.
2019-03-01 22:19:11 -06:00
Lirusaito
3b9a0cfbc8
Lowercase default looks bad next to windlight defaults, capitalize it.
2019-02-25 13:09:04 -05:00
Lirusaito
46dff21e97
Feature Request: Post Process Effects from Quick Settings flyout
...
Adds a neat little signal for post process to fire when effects change
Isn't code wonderful?
2019-02-25 12:50:08 -05:00
Lirusaito
2773c22f9b
Fix los argumentos truncamientos
...
Gracias a Damian
2019-02-17 16:46:51 -05:00
Lirusaito
049c1e16b0
Aurora-Sim is now WhiteCore
...
Minor Alchemy merge in removing llvlmanager,
indra_constants no longer has *_LAYER_CODE
2019-01-25 21:21:55 -05:00
Shyotl
04ea11c61e
Make gcc happier.
2018-11-20 02:49:57 -06:00
Shyotl
736696ac36
Track glEnable states via static refs instead of map lookups.
...
Sync light state, bound shader, and various gl context states similarly to render matrices.
Texture handles now refcounted, as multiple viewer textures could ref the same handle (cubemaps do this)
Clean up gl extension loading a bit. Not necessary, but only look for ARB variants if not included in current core version. Removed unused extensions.
Use core shader api if supported, else use ARB. (FN signatures are identical. Just doing some pointer substitution to ARB if not core.)
Attempt at improving VBO update batching. Subdata updates better batched to gether per-frame.
There's probably other stuff I forgot that is in this changeset, too.
Todo: Fix lightstate assertion when toggling fullscreen with shaders off.
2018-11-19 00:37:48 -06:00
Shyotl
fe764ae97f
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2018-08-07 21:46:07 -05:00
Shyotl
d11899561b
Optimization pass.
2018-08-07 01:09:53 -05:00
Drake Arconis
54fe7a8606
Well this...compiles
2018-04-26 15:54:24 -04:00
Shyotl
92eb988f2a
Pull in vertex buffer changes from alch.
2018-02-05 00:06:54 -06:00
Shyotl
85cb3cb0d0
Clean up deferred shaders by moving common methods into shared glsl file
2018-02-04 23:08:31 -06:00
Shyotl
8fd728ca59
Clean up generated prepended shader preprocessor mess.
2018-02-04 23:06:16 -06:00
Shyotl
a39844f9f3
Double the maximum texture memory.
2018-02-04 23:01:44 -06:00
Shyotl
2195c2af37
And.. a missing line.
2018-02-04 23:01:38 -06:00
Shyotl
a3b37f58e3
Tweak shadows to look a little less crap.
2018-02-04 23:00:55 -06:00
Shyotl
b24635d24e
RMSE bugfixes.
2017-04-01 21:55:13 -05:00
Shyotl
f95be54bd5
Merge https://github.com/Lirusaito/SingularityViewer/tree/Release
...
# Conflicts:
# indra/newview/app_settings/settings_sh.xml
2017-03-27 23:25:33 -05:00
Shyotl
97a6f3a7b2
noisemap tweaks and cleanup.
2017-03-27 23:13:56 -05:00
Shyotl
f1063afea1
Tweak alphamask RSME and allow multiselect derender.
2017-03-25 00:35:48 -05:00
Lirusaito
0dfef2ab25
PyFx partial integration
...
Adds PyFx windlights and post process effects, not enabled by default.
Show custom graphics settings by default, because all our users are smart.
Tweaks SHAutoMask, uses Altocumulus as default cloud now
Added TODO into llrender/llpostprocess.cpp
We should also add the option to make the menu bar transparent, instead of pyfx using skin hacks
Also we need to add a settings preset feature at some point in the future.
We also need to add postproc to wlf.
2017-03-20 11:10:21 -04:00
Shyotl
f4a713a500
Merge.
2017-03-14 04:02:53 -05:00
Shyotl
4a9ff22eeb
I was critically damp once. It was okay.
2017-03-14 01:44:26 -05:00
Shyotl
d42e380698
Minor cleanup.
2017-03-13 23:54:56 -05:00
Shyotl
75c47e96b6
Fixed numerous bugs.
2017-03-09 23:49:56 -06:00
Shyotl
6523cf43be
Fix some remaining callers to ui draw methods that have recently had their winding switched to CCW.
2017-02-26 23:19:12 -06:00
Shyotl
5d96bd8966
Fix winding issues with various ui draw methods. Face culling is actually disabled during ui rendering, but it's still good to do winding correctly regardless. Also automated tri strip batching.
2017-02-24 01:49:31 -06:00
Shyotl
5e501b9611
Removed TT_RECT_TEXTURE and removed unnecessary shaders.
2017-02-17 23:37:46 -06:00
Shyotl
983a7e31dc
Have gl_rect_2d and gl_rect_2d_simple use TRIANGLES instead of TRIANGLE_STRIP
2017-02-17 23:15:45 -06:00