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
7d156389e4
MAINT-8043 Fix for bad_alloc crash in LLImageGL::setImage()
2017-12-18 20:29:50 +02:00
a14b9cb604
MAINT-6635 Fix for LLImageGL::setSize crash
2016-10-07 03:52:04 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05: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
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05: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
a7aed07a5b
broke out llunit.h into llunittype.h and llunits.h for unit declarations
...
changed unit declarations macros to make a lot more sense
2013-08-27 13:41:19 -07: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
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07: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
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04: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
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
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
8c0aa31536
Adding optimization to skip alpha image analysis when it isn't needed.
2012-10-04 00:42:31 +00:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07: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
bedbbf7c02
Merge
2012-06-28 16:32:54 -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
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
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
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
4353eeb928
SH-469 GL_ARB_texture_multisample support
2011-05-24 15:29:33 -05:00
54c8827135
SH-353 FIXED Crash when toggling anisotropic filtering
2010-11-04 16:54:20 -04:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
c330e26db8
slightly conflicty merge from viewer-trunk, again
2010-04-12 11:57:07 +01:00
0dee7a3ece
debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D.
2010-04-09 22:02:32 -06:00
93b74186a3
EXT-5553 improve alpha mask ('fast alpha') heuristic
...
rev'd by davep
2010-02-19 09:45:30 +00:00
b00813ae3c
EXT-4388 Crash in octree line segment intersection code
...
a more complete fix and some sanity to prevent recurrance of a similar problem.
reviewed by bao!
2010-01-25 16:35:50 -08:00
4c91f45448
Clean up the llimage init-ordering and header comments, to make it clearer when we miss initializing a member. No semantic change.
2010-01-19 12:58:49 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
efd58603da
reverting changes from 130124 - suspected cause of Mac crashes during login.
2009-08-12 22:05:37 +00:00
Rider Linden