Commit Graph

423 Commits

Author SHA1 Message Date
Shyotl
4043130f75 Update texturelist/volumetexture management with changes from upstream. Note: TEX_LIST_SCALE not utilized in singu... yet. 2019-10-19 04:05:34 -05:00
Shyotl
1c1e64f48f Merge branch 'animesh' of https://github.com/singularity-viewer/SingularityViewer.git into animesh 2019-09-29 19:29:28 -05:00
Shyotl
4b6d1934c3 Clear out VAOs properly. 2019-09-29 19:29:03 -05:00
Rye Mutt
8561af1f84 Add abseil hashmaps and use in texture list, also fix bugs in texture list insertion 2019-09-28 19:03:49 -04:00
Shyotl
3bc4d6fd63 Fix UI backgrounds vanishing when toggling basic shaders on and off. 2019-07-17 20:20:41 -05:00
Shyotl
94787c6da8 Quiet down harmless debug warnings on nVidia when using renderDebugGL. 2019-07-15 21:00:09 -05:00
Shyotl
279d919164 Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer.git into animesh 2019-07-03 19:42:40 -05:00
Shyotl
b5cb6459b0 Tweak memory detection algorithm. 2019-07-03 16:00:16 -05:00
Router Gray
3951f6f516 Fix no newline at EOF. 2019-05-24 12:06:31 -05:00
Shyotl
1351a2695e Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer.git into animesh
# Conflicts:
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvovolume.cpp
2019-04-11 02:02:05 -05:00
Lirusaito
278459bdf2 New Fonts to complain about!
Thanks Drake!
Tweaks panels to look good now that font is slightly wider
2019-04-10 15:26:23 -04:00
Shyotl
3e0b75c4f7 Fix issue where alpha_mode_none and alpha_mode_emissive on rigged faces were being alpha tested and discarded. 2019-04-09 16:01:14 -05:00
Lirusaito
1ef5dc2c5d Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh 2019-04-09 02:30:24 -04:00
Shyotl
8ed9934a87 Fix memory tracking bug with vertex buffers. (Cosmetic. Only affects debug stats) 2019-04-08 18:13:28 -05:00
Lirusaito
2faca7d7e2 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh 2019-03-26 05:23:26 -04:00
Shyotl
7b5d7376c6 Make opengl extension loading be core compliant. Avoid issuing glGetString before context creation on Windows. 2019-03-25 19:21:45 -05:00
Lirusaito
06dfeb72d7 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh 2019-03-25 17:21:16 -04:00
Shyotl
f3afe45e72 Fixed some gl errors. 2019-03-25 02:56:20 -05:00
Lirusaito
424221201c Actually save current Post Process Effect at logout
Also properly cleanup Post Process Singleton
2019-03-23 05:01:13 -04:00
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