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
6f179fc6ac
fix for EXT-5854:Unable to Pay Object That Features Transparant (alpha) Texture.
2010-03-25 17:21:39 -06:00
8bafcc0491
EXT-5553 improve alpha mask ('fast alpha') heuristic
...
rev'd by davep
2010-02-19 09:45:30 +00:00
Tank_Master