Commit Graph

78 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
daf63eb418 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2019-10-19 00:01:59 -05:00
Shyotl
15c3ff0544 Minor bits and bobs from upstream. 2019-10-18 23:59:41 -05:00
Rye Mutt
a559a09217 Fix a ton of small bugs in 64bit memory value handling 2019-10-09 16:52:46 -04: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
Router Gray
c90c303fd4 [Linux] Fix 'error: invalid initialization of non-const reference'. 2019-08-20 21:05:50 -05:00
Shyotl
d2b28f60ff Speed up object param lookups. 2019-08-07 22:50:08 -05:00
Shyotl
21b1d5b52e Hotspot elimination. 2019-08-07 21:21:36 -05:00
Shyotl
225d174ec6 MIN_MEM_FOR_NON_TEXTURE setting doesn't work well with new math. Lower signifigantly. 2019-07-18 01:33:47 -05:00
Shyotl
b5cb6459b0 Tweak memory detection algorithm. 2019-07-03 16:00:16 -05:00
Shyotl
d7e7701927 Make texture fetch type (mFTType) a const member variable and remove from init() call. forceRefetch was clobbering mFFType via init call and firstinit boolean is a stupid hack. 2019-04-26 22:52:48 -05: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
Shyotl
2d8fbb89c9 Intermiediary commit. 2019-03-16 17:51:00 -05:00
Lirusaito
58ba9e3617 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2019-03-02 19:01:49 -05:00
Lirusaito
674abf478b Fix skin previews, allow using images from paths on disk 2019-01-28 20:46:47 -05: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
a39844f9f3 Double the maximum texture memory. 2018-02-04 23:01:44 -06:00
Shyotl
f4a713a500 Merge. 2017-03-14 04:02:53 -05:00
Shyotl
f26a5e9d62 Added FTType to texture fetch methods. Baked texture fetch now uses dynamic retry policy. 2016-05-01 19:44:06 -05:00
Shyotl
be5d2f20bc llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default. 2016-04-11 02:51:08 -05:00
Shyotl
0841479ccc llcommon merge. Added LLUnits. 2016-04-06 01:31:20 -05:00
Lirusaito
e62261edb2 Sync with Alchemy, includes much awaited lib updates for Linux
Applies ALCH-420 - Replace all invisiprims with fully transparent texture and remove dead code paths
-ARC no longer takes invisis into consideration.

Syncs some script keywords updates.

Changes all "\n" in llfloaterabout.cpp to '\n' because screw.dat
2016-03-27 23:24:17 -04:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Siana Gearz
a5103a1fc1 Sprinkle some Intel GPU support on Linux 2013-11-18 04:22:21 +01:00
Shyotl
af8f8bb040 Mats. 2013-11-02 01:20:05 -05:00
Shyotl
c47f6405d2 Texfetch/cache changes:
Added SEND_UDP_REQ and	WAIT_UDP_REQ fetch states.
Parse 'content-range' from headers.
Purge 'complete' textures from the cache if they lack 'end of codestream' marker.
Added boostlevel/category to textureview display.
More diagnostic output.
Discard handling tweaks/bugfixes from v3.
2013-09-23 17:19:44 -05:00
Shyotl
d4a545fb16 More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs. 2013-06-01 05:11:18 -05:00
Shyotl
ef3e918558 Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)! 2013-05-31 05:33:41 -05:00
Aleric Inglewood
45e6b7975f First version of HTTP bandwidth throttling.
Adds throttling based on on average bandwidth usage per HTTP service.
Since only HTTP textures are using this, they are still starved by other
services like inventory and mesh dowloads. Also, it will be needed to
move the maximum number of connections per service the to the PerService
class, and dynamically tune them: reducing the number of connections is
the first thing to do when using too much bandwidth.

I also added a graph for HTTP texture bandwidth to the stats floater.
For some reason the average bandwidth (over 1 second) look almost like
scattered noise... weird for something that is averaged...
2013-04-24 22:04:21 +02:00
Latif Khalifa
5396d17f2a Merge remote-tracking branch 'aleric/master'
Conflicts:
	indra/newview/lltexturefetch.cpp
	indra/newview/llviewerwindow.cpp
2013-04-23 12:13:54 +02:00
Shyotl
2121e78b45 Lessen occurrence of missing prims. Also added 'ctrl-shift-v' to rebuild vbos. 2013-04-20 01:00:24 -05:00
Aleric Inglewood
07201a5cfe Add AICurlInterface::getNumHTTPRunning
Replaces LLTextureFetch::getNumHTTPRequests.
Returns AICurlInterface::Stats::running_handles.
This is work in progress that temporarily doesn't compile because
LLTextureFetch::getNumHTTPRequests is still being used somewhere.
2013-04-08 06:39:06 +02:00
Drake Arconis
b800320a49 Remove LLMemType and related files 2013-03-04 12:02:01 -05:00
Shyotl
76f3dc9e19 Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback. 2013-02-19 01:50:46 -06:00
Shyotl
51cbb8d6bd Catch up with LL regarding viewer stat recording. 2013-02-14 17:45:10 -06:00
Shyotl
e622e03d2a Bulk of server-baking impelmentation and a bit of cleanup. 2013-01-13 02:37:12 -06:00
Shyotl
54771409d6 Merge branch 'master' into sunshine
Conflicts:
	indra/llimage/llimage.cpp
	indra/llui/llui.cpp
	indra/newview/llvoavatar.cpp
2013-01-08 17:05:29 -06:00
Shyotl
3ca39ab3f1 Client-side maturity handling when teleporting. Adds new notification that asks if you want to change maturity settings with a single click and automatically re-fire the teleport request. 2012-12-25 02:30:51 -06:00
Shyotl
1083d7e0ef Added LLGLTexture. Virtually completely virtual for now. Also added LLTextureManagerBridge, although not yet utilized. 2012-12-22 23:58:42 -06:00
Shyotl
034c83f996 Added trivial diagnostic message regarding teleport handling. 2012-12-14 16:28:18 -06:00
Shyotl
3627b33eec Reworked flexi update handling a little bit. 2012-12-10 19:55:17 -06:00
Shyotl
794dbacea3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
2012-11-29 11:54:41 -06:00
Shyotl
9d8f31a0cb Some teleport reworking. Don't clear rebuild groups/resetVBO unless tp screen is up, or we've just changed sims. Also skip updateUI drawing if tp screen is up. 2012-11-18 02:41:37 -06:00
Shyotl
d2422b03be Don't flush rebuild queue nor flush pending texture requests if merely performing a local teleport (eg: doubleclick teleporting within current sim.) 2012-11-13 23:34:48 -06:00
Shyotl
1cdc11dae2 Added LLTextureFetch::deleteAllRequests procedure. Called upon teleport. 2012-11-09 18:45:57 -06:00
Shyotl
81c7445744 image->hasFetcher() check reundant in LLViewerTextureList::clearFetchingRequests(). LLViewerFetchedTexture::forceToDeleteRequest() checks for this too. 2012-11-09 18:12:57 -06:00
Shyotl
02f214d8a7 Clear object rebuild queues upon teleport. 2012-10-22 15:25:02 -05:00