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

253 Commits (ea3b2b42e1e192ca708c4f062f526e7ea588ef89)

Author SHA1 Message Date
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Nicky 8c91463476 FIRE-12968; Even though the root cause is likely the shader memory overrun, preseed the VBO pools to take some strain from the driver. Remove the LLStrider changes while at it, those are not used in the Havok version and have not triggered anything in the OS version since month. 2014-03-10 00:45:41 +01:00
Xiaohong Bao 0c60e32808 Merge 2013-10-21 16:57:38 -06:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 1acceb3633 changed ll_aligned_(malloc|free) to take alignment size as a template argument 2013-10-14 10:18:41 -07:00
Dave Parks 0e116741a0 MAINT-2968 Fix for crash on AMD hardware running current drivers. 2013-10-10 18:00:11 -05:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 754e8752a9 added initial memory usage tracking for lltrace 2013-10-03 14:30:34 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Richard Linden 12f0f8cb72 changed over to manual naming of MemTrackable stats 
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
 2013-10-01 13:46:43 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro 
another attempt to move mem stat into base class
 2013-09-05 14:04:13 -07:00
Graham Linden 8675ed0491 Fix merge regressions from missed changes to LoD updates 2013-08-19 16:04:28 -07:00
Richard Linden e340009fc5 second phase summer cleaning 
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
 2013-08-09 17:11:19 -07:00
Graham Linden 42ce98e8bf NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehow 2013-07-30 13:44:12 -07:00
Graham Madarasz (Graham Linden) b44e7303d8 NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac 2013-07-29 18:59:45 -07:00
Graham Linden 1587999b03 Add info to vert buffer warnings to track down fullbright alpha mask crasher 2013-07-16 12:03:42 -07:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz e40bcc4e16 NORSPEC-59 and NORSPEC-133 work-around crash with RenderDebugGL on and fix breakage in shaders from Mac changes 2013-04-17 09:05:40 -07:00
Dave Parks 8025b8b2bc NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available 2013-04-15 13:16:14 -05:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Dave Parks 679a095aa0 NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials. 2013-04-02 15:45:17 -05:00
Dave Parks fc4869fb78 NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps. 2013-03-29 16:13:36 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 9a7a19c77a Merge 2013-03-13 17:13:45 -05:00
Dave Parks 08ae21f52d MAINT-2410 Extra Particle Parameters -- viewer implementation 
Reviewed by Kelly and Graham
 2013-03-13 17:07:22 -05:00
Graham Madarasz (Graham Linden) 35383790fb Merge pragma warning hack to fix linux build 2013-03-12 04:40:51 -07:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations. 
Reviewed by Graham
 2013-03-04 18:01:42 -06:00
Dave Parks f5e5396c3a MAINT-2371 First set of profile guided optimizations. 
Reviewed by Graham
 2013-02-26 15:15:08 -06:00
Nyx Linden 11fe124ae9 merging in viewer-beta. 
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
 2013-01-24 16:22:49 -05:00
Tank_Master 33922af1fa Merge LL release 2013-11-01 19:52:14 -07:00
Tank_Master 5e2324b5d3 Backed out changeset: f632d5a3a4e3 - has unwanted side effects 2013-10-17 23:46:34 -07:00
Dave Parks ecbdb4948f MAINT-2968 Fix for crash on AMD hardware running current drivers. 2013-10-10 18:00:11 -05:00
Ansariel 319f0fbcc6 Fix merge error in llvertexbuffer.cpp 2013-10-07 22:43:30 +02:00
Tank_Master 119ce81029 Merge viewer bear updates + merge fixes 2013-09-23 22:10:59 -07:00
Tank_Master 0c314a0e6f Merge LGPL 2013-09-21 16:59:50 -07:00
Tank_Master 05ad3a1c29 Merge Viewer-bear (merge of materials + fixes) to FS-exp 2013-09-21 11:44:46 -07:00
Tank_Master 5519c39beb Merge Viewer-bear (Materials 3.6.6 RC) 2013-09-16 16:18:33 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Nicky de2c9af677 Backout of c0f5f3933a72. That call is likely okay and the driver crash is due to some other reason way before that. 2013-08-26 22:16:42 +02:00
Nicky 3b0f5a01da Don't let glBufferSubDataARB read/write beyond buffer boundaries. 2013-08-10 22:46:31 +02:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Nicky 4d70926425 Performance; Remove FastTimers from Vertexbuffer (hot code path) found by Zwagoth (NACL) & me. 2013-04-24 01:15:29 +02:00