e7ac4695e3
Merge viewer-release
2013-09-09 12:59:17 -07:00
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
3a8ad62d9b
Merge with latest viewer-release.
2013-07-11 19:46:20 -04:00
bd41392b7e
Merge with viewer-bear which was just merged with viewer-release
2013-06-28 13:36:41 -07:00
b6b4b59138
Merge with viewer-release
2013-06-27 18:03:47 -07:00
45b1466de6
Review cleanup
2013-06-18 19:51:02 -05:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07: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
98e02a5d76
Merge new boost and add OS X 10.8 mods
2013-02-22 09:49:58 -08:00
2fd0e6e8f9
Merge viewer-cat and resolve conflict with alternate self
2013-02-21 16:50:04 -08:00
615af0c556
MAINT-2150 Fix for super-large ( > 4096 ) snapshots having black borders
2012-12-18 16:39:48 -06:00
0302573348
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2012-12-11 16:38:10 -05:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
cb96ab1a6f
MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled.
2012-07-18 15:49:47 -05:00
cfc5236e64
MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled.
2012-07-18 15:49:47 -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
86e84ae75e
Crashfix; handle errors in release builds more gracefully.
2012-09-01 15:24:54 +02:00
e3a5125b41
MAINT-616 Potential fix for corrupted mip maps.
2012-05-25 17:58:12 -05: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
f53fa08c70
MAINT-708 Use texture compression to minimize memory bloat (experimental)
2012-03-02 13:35:10 -06:00
f9f247c5a6
SH-2084 Don't error out on framebuffer mismatch -- probably causing a crash when some post-snapshot or minimize/restore operation gets out of phase.
2011-12-07 16:36:26 -06:00
c4aa8c50da
SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
2011-10-04 02:31:54 -05:00
ac37656aa5
SH-2276 Fix for failed assertions reported from debug-enabled viewers. Also, remove "Basic Shaders" as a user settable option (shaders are always on if GL version >= 2.0, always off otherwise)
2011-10-02 02:12:21 -05:00
f558d86578
SH-2244 Don't use multisample texture (ever), and don't use GL_DEPTH_COMPONENT32 (use GL_DEPTH_COMPONENT24)
2011-09-30 01:11:26 -05:00
26568d5c98
SH-1838 Add error handling for allocation of off screen render targets.
...
Reviewed by Leslie
2011-07-20 16:06:04 -05:00
44f0a1b681
SH-1778 Physics shape display fix up.
2011-06-11 16:51:01 -05:00
ffab1eef57
Mac build fixes.
...
Reviewed by davep.
2011-06-03 16:24:07 -07:00
9eea451a82
SH-469 Don't use depth buffers and multisample buffers where not absolutely needed -- make sample counts consistent between shaders and render targets.
2011-05-25 15:51:15 -05:00
4353eeb928
SH-469 GL_ARB_texture_multisample support
2011-05-24 15:29:33 -05:00
fd574e3485
merge
2011-05-19 20:42:56 -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
19a06478d9
SH-1618 FIX -- Lighting and shadows crash ATI macs
...
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
the use of glEnable/glDisable on textures above the texture unit count
and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.
Reviewed by davep
2011-05-19 17:28:23 -07:00
48b107ac97
Apparently the new standard is to NOT suffix ARB extension function pointers with ARB.
2010-12-03 02:37:14 -06:00
0be7fcf2a9
SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02 21:33:03 -06:00
798ba26952
More aggressive management of FBOs. Allocate as few FBOs as possible, assert when FBOs are destroyed out of order.
2010-10-28 17:39:45 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
d43aef498b
Enable FBO on OSX
2010-09-28 14:43:52 -05: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
simon