Commit Graph

34 Commits (cfb666e9d9eb8945a79e2f7999459267caca36ee)

Author SHA1 Message Date
Dave Parks 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
Dave Parks 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
Dave Parks 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
Dave Parks 26568d5c98 SH-1838 Add error handling for allocation of off screen render targets.
Reviewed by Leslie
2011-07-20 16:06:04 -05:00
Dave Parks 44f0a1b681 SH-1778 Physics shape display fix up. 2011-06-11 16:51:01 -05:00
Leslie Linden ffab1eef57 Mac build fixes.
Reviewed by davep.
2011-06-03 16:24:07 -07:00
Dave Parks 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
Dave Parks 4353eeb928 SH-469 GL_ARB_texture_multisample support 2011-05-24 15:29:33 -05:00
Dave Parks fd574e3485 merge 2011-05-19 20:42:56 -05:00
Dave Parks 51bb3c15c8 SH-469 WIP -- get rid of LLMultiSampleBuffer and use GL_ARB_texture_multisample instead. 2011-05-19 20:38:39 -05:00
Leslie Linden 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
Dave Parks 48b107ac97 Apparently the new standard is to NOT suffix ARB extension function pointers with ARB. 2010-12-03 02:37:14 -06:00
Dave Parks 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
Dave Parks 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
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks d43aef498b Enable FBO on OSX 2010-09-28 14:43:52 -05:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks d3d59f6b14 Backed out changeset: ec7f6f4bd908 2009-11-24 17:51:50 -06:00
richard 854e2eaf9a added viewports to LLRenderTarget to speed up animation of sidetray
reviewed by Leyla
2009-11-11 12:01:17 -08:00
Martin Reddy b5724bc0e9 SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
fixes all of the parentheses warnings in the code.

Original patch was reviewed by merov (and others).
2009-09-25 16:51:25 +00:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
2009-09-22 11:11:45 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
Steven Bennetts 4a6bacea0f merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Steven Bennetts 875606a04d QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2008-05-11 20:56:42 +00:00
Steven Bennetts 068da0b565 merge release-QAR-511 Viewer 1.20 RC 5
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
2008-05-06 18:09:03 +00:00
Steven Bennetts 3901894708 QAR-488 Viewer 1.20 RC 2
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
2008-04-23 01:04:01 +00:00
Steven Bennetts 6fcf38217e merge release@82858 maint-render-2-merge@83010 -> release
QAR-389
2008-03-25 22:50:26 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00