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
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
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
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
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
Stinson Linden