livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,715 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

106 Commits (7394730eaafee0801db97db1ab8cf6b290e5ab14)

Author SHA1 Message Date
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Nyx (Neal Orman) c07f55e605 merging latest viewer-development to mesh merge candidate. 2011-07-25 18:26:14 -04:00
Dave Parks 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
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Leslie Linden f587af0af1 Build fix for Mac OS X. 2011-07-11 15:16:56 -07:00
Dave Parks 9db49b4448 SH-2038 Disable usage of stream vbo on mac and make flexi's use stream vbo if stream vbo disabled (effectively disables usage of vertex buffers for flexible objects on mac) 2011-07-11 12:14:06 -05:00
Dave Parks b5149a63f9 SH-2038 Compatibility fix for mac build (GL_ARB_sync symbols not defined on OSX) 2011-07-11 11:41:34 -05:00
Dave Parks 268f3dbdea SH-2038 Fix for some compiler errors from the apple tweaks -- also add a fence API (disabled for now). 2011-07-10 02:29:39 -05:00
Don Kjer e4d0d62e71 Added support for apple flush buffer range 2011-07-09 22:30:30 -07:00
Dave Parks f1443579b3 SH-2038 Potential fix for a myriad of performance problems concering VBO usage. 2011-07-09 02:28:34 -05:00
Xiaohong Bao 32f8b47497 debug code for SH-692: Viewer Crash when enabling Render Metadata > Physics Shapes on Mesh Sandbox 25 on Windows XP 2011-06-21 12:00:38 -06: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
Xiaohong Bao b594d3b04d add debug mode to track the memory allocation/deallocation. 2011-05-10 21:02:20 -06: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 fc106df530 fix the compiling error: "free" is defined and in use globally. 2011-02-24 19:47:55 -07:00
Xiaohong Bao 3f6208b176 Merge 2011-02-24 16:20:43 -07:00
Xiaohong Bao 844bf22d25 apply private pool to VBO 2011-02-23 19:48:08 -07:00
Xiaohong Bao 95838efeaa Merge 2011-02-23 14:39:42 -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
Xiaohong Bao 01cdeb0cdd Merge from viewer-development 2011-02-23 10:44:59 -07: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
Xiaohong Bao f4ff1430f0 first iteration of memory pool code 2010-12-03 22:16:16 -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