Commit Graph

90 Commits (f1443579b32cf260e7ad35f35de3930f0f801bd2)

Author SHA1 Message Date
Dave Parks f1443579b3 SH-2038 Potential fix for a myriad of performance problems concering VBO usage. 2011-07-09 02:28:34 -05:00
Dave Parks dd4e506101 Followup on mapbuffer work -- only use map buffer where map_buffer_range is available, and allow non-buffer-mapping implementation to take advantage of recorded mapped regions. 2011-06-10 01:28:53 -05:00
Leslie Linden ffab1eef57 Mac build fixes.
Reviewed by davep.
2011-06-03 16:24:07 -07:00
seth_productengine d4e09e81ca Linux build fix.
Unused local varible removed.
2011-06-02 17:03:51 +03:00
Dave Parks 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
Dave Parks 1fd46831f0 SH-1682 Work in progress on using texture indexes to improve batch size (wow, super fast so far) 2011-05-29 00:40:57 -05:00
Dave Parks 8017900e7f merge 2011-05-12 18:50:22 -05:00
brad kittenbrink 2a843e9a6b Fix up alignment problems for debug build.
reviewed by davep.
2011-05-12 16:09:42 -07:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
brad kittenbrink d4b9db012e FIX VWR-25609: crash on shutdown in LLGLNamePool::sInstances destructor 2011-04-26 15:04:22 -07:00
Merov Linden 76a325b832 STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error) 2011-03-08 17:00:39 -08:00
Xiaohong Bao a313cedd69 fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
reviewed by davep
2011-03-07 15:02:48 -07:00
Dave Parks 719610e68b SH-1225 Import convex hull data from .slm 2011-03-29 11:50:02 -05:00
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -05:00
Xiaohong Bao 3f6208b176 Merge 2011-02-24 16:20:43 -07:00
Loren Shih 3d77dd6b58 Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually. 2011-02-23 16:24:47 -05:00
Xiaohong Bao 609c70eb5a separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.
reviewed by davep.
2011-02-23 11:41:13 -07:00
Loren Shih 9b50def44f Automated merge up from viewer-development into mesh-development 2011-02-23 12:50:17 -05:00
Dave Parks e55e91a5a5 SH-874 Better VBO usage hints, most notably don't use VBOs for occlusion queries if GL is set to not use VBOs for stream draw. 2011-02-22 18:36:50 -06:00
Xiaohong Bao 417069f152 more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-22 11:22:50 -07:00
Dave Parks 9e0ee4dff0 SH-1006 Quick pass at cutting down the number of redundant GL calls based on data from gDEBugger.
Reviewed by Nyx.
2011-02-17 17:18:57 -06:00
Xiaohong Bao f13884e528 partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-15 14:12:58 -07:00
Loren Shih a5e63b1dc0 Merge 2010-11-08 12:57:26 -05:00
Xiaohong Bao 219cd6ecda more debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer. 2010-10-14 21:23:23 -06:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Xiaohong Bao c3764eaf87 add debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer 2010-10-12 15:38:52 -06:00
Matthew Breindel (Falcon) 569f3f4b06 Merge 2010-09-22 13:04:53 -07:00
Dave Parks 7d625ef060 merge 2010-09-22 01:44:44 -05:00
Dave Parks 61257991ba Stop using aligned malloc in llvertexbuffer (tcmalloc is automagically aligned). 2010-09-22 01:43:22 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 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
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks 340a729d55 Vertex buffer cleanup, adding water shader to simple rigged attachments.
Reviewed by Nyx.
2010-08-12 17:05:40 -05:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Dave Parks 46768c3c6c Merge? 2010-07-12 07:39:23 -05:00
Dessie Linden 67f0a792a2 Merged from viewer-release 2010-06-30 12:03:06 -07:00
Dessie Linden 070311d5cc Merged from viewer-release 2010-06-30 12:03:06 -07:00
Dave Parks ea0192f157 Line endings. 2010-06-28 16:11:22 -05:00
Dave Parks f740214f9d Porting VBO changes from davep/viewer-release.
Better usage of LLVertexBuffer::sEnableVBOs.
Added RenderUseStreamVBO debug setting for controlling usage of VBOs for particles/avatars/etc.
2010-06-28 16:09:36 -05:00
Dessie Linden 51c8c74da5 Merged from viewer-release 2010-06-11 15:04:21 -07:00
Dessie Linden d50a34e6e3 Merged from viewer-release 2010-06-11 15:04:21 -07:00
Palmer 3bb98107a9 Backed out changeset useVBO fix, 12f94ed4e02b, "LLVertexBuffer only supposed to use sEnableVBOs at moment vert buff is created" for EXT-7835. Will fix soon. 2010-06-11 11:34:15 -07:00
Dave Parks f9b13d8f85 Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes. 2010-06-10 00:45:48 -05:00
Tofu Linden 9878c02404 add some #includes for our wrappers 2010-06-04 09:07:25 +01:00
Tofu Linden f40d07512a finish conversion to ll_aligned_*() wrappers 2010-06-04 09:04:36 +01:00
Dave Parks 0c8164b894 Fix for useVBOs being busted when sEnableVBOs gets flipped.
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
(transplanted from 11bf20602885c3d2d42d8a7f7361d2005a708b5c)
2010-06-04 00:09:52 -05:00
Dave Parks 3906a4eb1d Fix for useVBOs being busted when sEnableVBOs gets flipped.
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
2010-06-04 00:09:52 -05:00
Dave Parks 697e7a3b0c Fix for useVBOs being busted when sEnableVBOs gets flipped.
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
2010-06-04 00:09:52 -05:00