381f8936f0
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llrender.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexture.cpp
2021-12-03 18:23:05 +01:00
e7830b39f0
SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey textures
2021-12-03 15:07:31 +00:00
4a1ef323ae
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-29 19:40:28 +01:00
0b066539fe
DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.
...
Reverting a merge is sticky: it tells git you never want to see that branch
again. Merging the DRTVWR-546 branch, which contained the revert, into the
glthread branch undid much of the development work on that branch. To restore
it we must revert the revert.
This reverts commit 029b41c041
2021-11-24 10:47:54 -05:00
d71e0a6d47
SL-16094, SL-16400: Merge branch 'DRTVWR-546' into glthread
2021-11-23 21:23:45 -05:00
2b96f89c2a
SL-16400: Add ThreadPool::start() method, and call it.
...
It's sometimes important to finish other initialization before launching the
threads in the ThreadPool, so make that an explicit step. In particular, we
were launching the LLImageGL texture thread before initializing the GL
context, resulting in all gray textures.
2021-11-23 20:39:32 -05:00
744646eb71
SL-16400 Fix for grey textures (hack).
2021-11-22 19:12:39 -06:00
9b0d8c7e62
SL-16094 More profile hooks for threading code, remove redundant wglCreateContextAttribs call
2021-11-22 18:42:56 -06:00
029b41c041
Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"
...
This reverts commit 5188a26a85819088563e
2021-11-15 09:25:35 -07:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
ff5496239b
SL-16202: Use WorkQueue::postTo() for texture create/post handshake.
...
That is, when LLViewerFetchedTexture::scheduleCreateTexture() wants to call
createTexture() on the LLImageGLThread, but postCreateTexture() on the main
thread, use the "mainloop" WorkQueue to set up the handshake.
Give ThreadPool a public virtual run() method so a subclass can override with
desired behavior. This necessitates a virtual destructor. Add accessors for
embedded WorkQueue (for post calls), ThreadPool name and width (in threads).
Allow LLSimpleton::createInstance() to forward arguments to the subject
constructor.
Make LLImageGLThread an LLSimpleton - that abstraction didn't yet exist at the
time LLImageGLThread was coded. Also derive from ThreadPool rather than
LLThread. Make it a single-thread "pool" with a very large queue capacity.
2021-11-05 12:33:31 -04:00
d848d9e888
SL-16202: Streamline WorkQueues in LLImageGLThread.
...
Use the new WorkQueue::postIfOpen() method in LLImageGLThread::post(). That
makes the LLImageGLThread method a trivial wrapper, which can accept templated
work items and pass them through to the WorkQueue method, eliminating double
indirection due to multiple layers of std::function.
Eliminate LLImageGLThread's WorkQueue intended for work on the main queue.
Since the main loop already has a WorkQueue of its own, post work directly to
that WorkQueue instead of using a separate WorkQueue misleadingly embedded in
LLImageGLThread.
Instead of looking up the main thread's WorkQueue every time, capture a
pointer in LLImageGL's constructor.
We no longer need a fallback queue for when the main thread's WorkQueue is
full. We no longer need the main loop to poll LLImageGL to service the local
main-thread-targeted WorkQueue, or to copy work from the fallback queue to the
main queue. That eliminates LLImageGLThread::postCallback(), mCallbackQueue,
mPendingCallbackQ, executeCallbacks() -- and even LLImageGL::updateClass() and
LLAppViewer's call to it.
Change LLViewerFetchedTexture::scheduleCreateTexture() to post work to the
main thread's WorkQueue instead of calling LLImageGLThread::postCallback().
2021-11-04 16:50:31 -04:00
3faba7515c
SL-16237 FIXED Viewer hangs on login
2021-11-01 19:38:55 +02:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
e774bffb28
SL-16202 Fix for textures appearing black or flashing white due to optimization bugs.
2021-10-21 21:19:48 +00:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
675514bdb3
SL-16093 Don't force the console window to be open on developer builds because it causes frame stalls while logging.
2021-09-27 23:56:06 +00:00
31e7c5b97c
SL-14150 Handle more cases of corrupted cache
2020-10-22 22:33:22 +02:00
0bf11e45ea
SL-14150 Handle more cases of corrupted cache
2020-10-22 22:22:17 +03:00
75f20a28d5
SL-14108 FIXED Viewer crashes immediately after login
2020-10-20 22:25:24 +02:00
83600bb16a
SL-14108 FIXED Viewer crashes immediately after login
2020-10-20 14:25:54 +03:00
3d37c73654
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-06-17 12:10:58 +02:00
84d3065596
SL-13281, add missing srgb->linear conversion for specular
2020-06-11 23:33:14 +03:00
02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
b659e5596e
SL-11514
...
Convince Geenzo code to get a little DeMorgan in it.
Trophy Unlocked: make all alpha textures partcipate in picking.
2019-06-28 08:45:07 -07:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
c4032528af
Roll back sRGB decode changes from contrib for now.
...
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
52019b64e8
Merge viewer-eep
2019-04-03 18:45:39 +02:00
3a42d2b94a
Whoops! Always make sure that our primary format is assigned.
2019-04-01 18:51:28 -07:00
0e47ca896d
Make LLImageGL's loading of assets as sRGB or linear conditional based upon sRGB decode support.
2019-04-01 18:34:56 -07:00
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
2513aa0ed1
Additional gamma correction work: start moving over to EXT_texture_sRGB_decode.
2019-03-30 03:18:02 -07:00
0272c47e5a
Tweaked naming a bit, also white space.
...
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
2019-03-29 11:57:45 -07:00
3fa8b844c3
Fixing gamma correction in EEP Step 1:
...
Thou shall always read the sky cubemap as sRGB using hardware sampling.
2019-03-29 02:51:41 -07:00
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
898c9f4421
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
2019-03-13 13:21:48 -07:00
05d6e376ac
Merge Firestorm LGPL
2018-09-27 22:35:07 +02:00
78866b33a9
Merge
2018-09-26 13:46:45 -07:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
cb20bc0425
Merge viewer-neko
2018-08-01 01:20:01 +02:00
e24d4c9f4d
MAINT-8923 Better allocation failure handling, createGLTexture crashes
2018-07-26 20:06:26 +03:00
4b19e4c1a5
Merged with RLVa tip
2018-06-18 01:09:54 +02:00
fcac8d4b83
Fixed comments
...
--HG--
branch : RLVa
2018-06-17 17:24:09 +02:00
577288d236
Merged with RLVa features & fixes
2018-05-26 18:08:53 +02:00
aa90a47a91
Added @setoverlay set of commands for a certain evil kitty
...
--HG--
branch : RLVa
2018-04-30 00:08:11 +02:00
7b56db31f9
Merge
2018-03-07 11:27:43 -08:00
99b82d9449
Atmospherics WIP
...
libatmosphere integrated in indra/llrender/llatmosphere.cpp
Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00:00
98569f84a2
Merge viewer-neko
2018-01-13 19:11:09 +01:00
7d156389e4
MAINT-8043 Fix for bad_alloc crash in LLImageGL::setImage()
2017-12-18 20:29:50 +02:00
a65b586b18
MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()
2016-12-08 17:21:05 +02:00
99d76f85f9
MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()
2016-12-08 17:21:05 +02:00
a1023dd89c
Merge viewer-bear
2016-10-10 22:19:33 +02:00
a14b9cb604
MAINT-6635 Fix for LLImageGL::setSize crash
2016-10-07 03:52:04 +03:00
e925c73ecc
Merge Firestorm LGPL
2016-04-14 13:18:41 +02:00
973965d5ec
Use 64bit integers for texture memory
2016-03-31 11:18:11 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
c78bd2aa1e
Backout 4cf3dd03650a for the time being as we currently do not need it
2015-05-06 09:22:26 +02:00
980ac325ca
FIRE-15947: Setting texmem to 1GB causes bias going up to 5
2015-04-26 20:16:55 +02:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
c307bda68a
Correcting a build error with the release viewer.
2014-05-08 21:58:51 +01:00
f43e46bc9c
MAINT-4009: Ensuring that the pick mask for the LLImageGL is always properly freed during its cleanup method.
2014-04-28 19:44:02 +01:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
1616b73ef3
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-19 16:12:07 -06:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
9f7bfa1c37
moved unit types out of LLUnits namespace, since they are prefixed
2013-08-15 00:02:23 -07:00
26581404e4
BUILDFIX: added header for numeric_limits support on gcc
...
added convenience types for units F32Seconds, etc.
2013-08-14 11:51:49 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
e40065f82c
BUILDFIX: #include and dependency cleanup
2013-07-19 15:03:05 -07:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
9fd3af3c38
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed Units macros and argument order to make it more clear
optimized units for integer types
fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-13 15:29:15 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
b864cecd6c
De-bork the viewer merge, causing black in-world images. Reviewed by Kelly
2013-05-13 16:34:52 -07:00
a099815774
Merge vwr-dev-mat
2013-05-11 08:11:13 -07:00
f2455ccaaf
Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
2013-05-10 16:10:25 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
03cfdeca7a
Fix ifdefs around asserts broken in release only by merge
2013-04-26 10:52:02 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
c7bab8ab8b
Merge
2013-04-11 16:04:21 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
019c7566fb
For MAINT-1291 Code Review: DaveP
2013-02-07 09:18:09 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
33922af1fa
Merge LL release
2013-11-01 19:52:14 -07:00
5e2324b5d3
Backed out changeset: f632d5a3a4e3 - has unwanted side effects
2013-10-17 23:46:34 -07:00
ecbdb4948f
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -07:00
a12d3c4f95
Properly release OpenGL textures.
2013-08-18 00:06:11 +02:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
0bb0bd514b
SH-3499 WIP Ensure asset stats output is correct
...
Finished making LLUnit implicitly convertible to/from scalar integer values
cleaned up test code
2012-11-08 23:42:18 -08:00
e6ca5471a2
SH-3275 Update viewer metrics system to be more flexible
...
put template parameter back in LLUnit units
added free function operators for mathematical manipulation of unit values
converted texture memory tracking to units
2012-10-17 00:06:22 -07:00
30aea02e8e
Fix for release build in gcc 4.6
2012-10-11 01:00:31 +00:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
19e43e4b58
Added fast timers for baked texture rendering. Updated appearance utility
2012-10-06 08:08:52 +00:00
8c0aa31536
Adding optimization to skip alpha image analysis when it isn't needed.
2012-10-04 00:42:31 +00:00
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
afcc61a07a
fix for SH-3238: Textures are loaded at lower detail on subsequent log-ins
2012-07-19 15:31:33 -06:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
e76211216d
Fixed FIRE-8417. Also, support for aurora-sim regions with non power of two sizes
2012-12-04 20:46:22 -07:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07:00
683c43c2e0
reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.
2012-09-20 10:00:55 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
bedbbf7c02
Merge
2012-06-28 16:32:54 -05:00
ed72fd0ae9
merge
2012-06-28 13:22:04 -05:00
74d4f8af01
v-r to drano merge conflicts wip
2012-06-26 16:43:58 -04:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
2eedd0c3c0
Merge with tip
2012-06-15 13:00:49 -07:00
b93a23aa82
MAINT-1147 Fix for frame stall on region crossing.
2012-06-13 18:05:56 -05:00
034cbbdc95
User-defined names was deprecated with OpenGL 3.1. Just generate/delete using OpenGL function.
2012-09-26 21:00:25 +02:00
e3a5125b41
MAINT-616 Potential fix for corrupted mip maps.
2012-05-25 17:58:12 -05:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
efda0814cb
MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.
2012-05-24 10:50:48 -05:00
534168c452
MAINT-616 Fix for crash on shutdown caused by previous changes.
2012-05-22 00:49:07 -05:00
b7cfd8c7f0
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
2012-05-21 23:33:25 -05:00
da29210ed6
fix a sculpt crash
2012-05-01 21:29:19 -06:00
164de6c180
fix for a crash on sculpt
2012-04-27 18:32:42 -06:00
7b3f721e7a
SH-3018 WIP - removed audit texture, other unused diagnostic code
2012-02-29 16:15:02 -05:00
f53fa08c70
MAINT-708 Use texture compression to minimize memory bloat (experimental)
2012-03-02 13:35:10 -06:00
dbef1616dc
SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious Ringtail avatar)
2011-11-16 12:40:51 -06:00
73d70b5d45
SH-2240 Make alpha mask cutoff a little less aggressive (err on the side of not creating an alpha mask)
2011-11-15 12:19:05 -06:00
fa5a0a90f4
SH-2240 Fix for core profile assertions when Debug GL enabled.
2011-11-03 15:00:40 -05:00
872567c0c1
SH-2244 Fix for mac build?
2011-09-28 16:51:23 -05:00
54ba56dbe9
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
2011-09-26 18:31:55 -05:00
57620a9da9
SH-2244 Vertex buffer cleanup, fix for bad vertices in rigged attachments, added "RenderUseVAO" debug setting to control whether or not to use VAO's in non-core GL profiles.
2011-09-23 17:59:05 -05:00
a2d08a6d80
SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and modify viewer to run under said context without generating errors.
2011-09-22 00:10:57 -05:00
861b7eba60
SH-2243 fix for mac build
2011-09-17 19:02:21 -05:00
421e52ff98
SH-2243 work in progress -- gDEBugger guided removal of deprecated state changes
2011-09-17 02:36:43 -05:00
428c762a3e
fix for SH-1498: crash at LLImageGL::deleteDeadTextures() line 1429
2011-08-19 13:27:51 -06:00
fe46a8e012
fix for sh-2307: crash at LLImageGL::setCategory(int) line 1890
2011-08-17 18:12:25 -06:00
6469f1c2f2
SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-17 00:24:08 -05:00
6992dbc1e3
SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
2011-06-01 23:46:04 -05:00
4353eeb928
SH-469 GL_ARB_texture_multisample support
2011-05-24 15:29:33 -05:00
51bb3c15c8
SH-469 WIP -- get rid of LLMultiSampleBuffer and use GL_ARB_texture_multisample instead.
2011-05-19 20:38:39 -05:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
ba1266043f
trivial: for VWR-22353: remove debug code for EXT-6791.
2011-01-07 15:04:36 -07:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
b3c06e6a74
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:49 -05:00
2504824d59
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:49 -05:00
e403f402e9
some debug code for SH-288: [crashhunters] LLImageGL::setSubImageFromFrameBuffer
2010-10-13 19:33:36 -06:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
2969599880
a try to fix EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-30 18:06:45 -06:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
6fbc79d5e8
Final(???) merge from viewer-release to viewer-public.
2010-08-24 14:52:05 +01:00
ce1a0c6baf
Final(???) merge from viewer-release to viewer-public.
2010-08-24 14:52:05 +01:00
f263ee0444
added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
...
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
17553add7c
added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
...
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
5f400b3b7c
more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-07-22 11:38:26 -06:00
731086241b
EXT-8457: FIXED: crash at [1] LLImageGL::checkTexSize(bool) [secondlife-bin llimagegl.cpp]
2010-07-22 11:28:16 -06:00
7ac8658c77
(hairy) merge from viewer-release
2010-07-26 10:34:39 +01:00
44d0fd81ee
(hairy) merge from viewer-release
2010-07-26 10:34:39 +01:00
13202e744c
merge
2010-07-14 11:11:31 -05:00
b088449517
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
2010-06-21 11:24:33 -07:00
a6cf0bed74
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
2010-06-21 11:24:33 -07:00
07f9e9035e
EXT-4388 Crash in octree line segment intersection code (getMask)
2010-06-18 13:29:10 -05:00
98d72d1dd3
Disabling some asserts for now so client is usable.
2010-05-22 12:49:32 -05:00
5ab2d07555
EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled
2010-04-30 13:50:59 +01:00
d3eb6ffff5
EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled
2010-04-30 13:50:59 +01:00
b0fa1e011f
EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled
...
(transplanted from 0aaf4b4676f27560cc436d0ff74b7d812a1e6662)
2010-04-30 13:50:59 +01:00
f28a9b3ca5
merge from viewer-trunk
2010-04-19 14:30:43 +01:00
b362cc60d9
merge from viewer-trunk
2010-04-19 14:30:43 +01:00
230314ac71
merge from viewer-trunk
2010-04-15 20:39:00 +01:00
5dda65c030
EXT-4388 Crash in octree line segment intersection code (getMask)
...
Add yet more paranoia-and-return-or-assert, this time for +-INF in input vector.
To be reviewed by Bao.
(transplanted from 2012f21d23c66179345fb26148cfbe19835b325e)
2010-04-15 20:15:40 +01:00
5c29fa9383
slightly conflicty merge from viewer-trunk, again
2010-04-12 11:57:07 +01:00
c330e26db8
slightly conflicty merge from viewer-trunk, again
2010-04-12 11:57:07 +01:00
f8f1e30ac3
slightly-hairy merge from viewer-trunk
2010-04-12 11:55:54 +01:00
9fbe736774
(slightly hairy) merge from viewer-hotfix
2010-04-12 11:03:16 +01:00
0dee7a3ece
debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D.
2010-04-09 22:02:32 -06:00
61774546f0
HUGE merge from viewer-trunk. Many conflicts resolved.
2010-03-30 13:15:36 +01:00
6acaa5fe30
If the EXT-5854 fix is correct, this assert no longer makes sense.
2010-03-26 08:54:58 +00:00
Ansariel