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

110 Commits (8bb3d0891dfd87b54cd45dfe199c2f1bf21205b3)

Author SHA1 Message Date
Richard Linden 93578f7e51 Automated merge with http://bitbucket.org/lindenlab/viewer-cat 2012-08-24 16:31:29 -07:00
Richard Linden a98c7e150b llfasttimer cleanup 
removed unnecessary cache miss from fast timers
renamed llfasttimer_class back to llfasttimer
 2012-08-06 16:08:04 -07:00
Dave Parks 096fe03786 MAINT-646 Faster traversal of render batch lists. 2012-06-01 14:27:04 -05:00
Dave Parks f53fa08c70 MAINT-708 Use texture compression to minimize memory bloat (experimental) 2012-03-02 13:35:10 -06:00
Dave Parks 2b2a03b3c5 SH-2511 Fix for bumpmapped objects flickering. 2011-12-12 17:12:47 -06:00
Dave Parks 428b74f14b SH-2652 Fix for black bands in high-res normal maps (break normal map generation up into tiles to handle the case where a normal map is higher resolution than the current window) 2011-11-08 13:11:29 -06:00
Dave Parks dfe75ba0eb SH-2610 Fix for black terrain when bump map is visible and shaders are not supported. 2011-10-24 12:35:53 -05:00
Dave Parks ae31a6f4a7 SH-2240 GL 1.2 compatibility pass 2011-10-20 15:14:16 -05:00
Dave Parks 4e894bfa31 SH-2600 Fix for busted texture animation on bump mapped objects. 2011-10-20 14:33:36 -05:00
Dave Parks 967479f903 SH-2031 Fix for stall in image update -- don't use the CPU to convert a height map into a normal map -- use the GPU instead via a shader. Also, WTF glFinish? 2011-10-05 15:12:02 -05:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Dave Parks 233e42b331 merge 2011-08-19 16:34:34 -05:00
Xiaohong Bao c3327eba03 fix for SH-1069: [REGRESSION] Sometimes bumpmaps load only partially 2011-08-17 15:33:18 -06:00
Xiaohong Bao b5f1ee3878 fix for SH-2023: Brightness Bump maps don't load when shadows are enabled 2011-08-16 17:00:12 -06:00
Dave Parks b9439ac006 merge 2011-08-08 15:30:34 -05:00
Dave Parks 14f6bbadef SH-2242 Work in progress migrating to glVertexAttrib everywhere 2011-08-08 15:29:23 -05:00
Xiaohong Bao f3130b85e6 fix for SH-2023: Brightness Bump maps don't load when shadows are enabled 2011-07-28 17:51:00 -06: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
Dave Parks 9b1c284d4c SH-1678 Fix for busted fullbright shiny. 2011-06-08 01:08:09 -05:00
Dave Parks 690f18c948 merge 2011-06-07 13:59:40 -05:00
Xiaohong Bao b100f1d2d4 fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307) 2011-06-01 12:09:40 -06:00
Dave Parks eca17c8993 SH-1682 Full integration if indexed texture rendering to improve batch size. 2011-05-30 01:25:55 -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
Oz Linden ecafe4d8ab fix more DOS line endings 2011-05-20 17:19:03 -04:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
Xiaohong Bao e32d1cf756 fix for STORM-973: [crashhunters] crash at LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *) 2011-04-05 15:28:18 -06:00
Dave Parks ec11823c77 SH-1069 Fix for some bump maps not loading fully. 
(transplanted from 1a03c3745cbbe47e5cc5dfec3a9114516865ddc0)
 2011-03-04 18:46:26 -06:00
Dave Parks a034ffd4b1 Remove unneeded assertion. 2011-03-21 17:30:26 -05:00
Dave Parks bf3fb25663 SH-1069 Fix for bump maps not loading fully -- don't clear bump image list on toggling deferred rendering, but do make sure a loaded callback exists when bump resolution or desired number of components is lacking. Also, subtract radius of prim from distance to face for virtual size calculations (makes heavily tiled textures on largish spheres fully res when appropriate). 2011-03-21 10:51:28 -05:00
Dave Parks 78cc321127 SH-1069 Fix for some bump maps not loading fully. 2011-03-04 18:46:26 -06:00
Dave Parks 32c4a448b1 SH-571 Fix for shadows disappearing for a frame whenever an object switches octree nodes. Regressed EXT-7155 so fix for regression included. 2011-01-19 23:16:53 -06:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -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 2f012dd34f merge 2010-08-25 14:48:18 -05:00
Dave Parks 9d5a3d7a2d Better support for curious mixtures fullbright/shiny/water with rigged attachments, deferred rendering, and not. 2010-08-13 19:35:03 -05:00
Richard Nelson fde4edf75d merge 2010-07-20 11:31:23 -07:00
Richard Nelson 572e72d8a1 merge 2010-07-20 11:31:23 -07:00
Xiaohong Bao 540e2d8e5d EXT-8301: FIXED: crash at LLViewerFetchedTexture::cleanup() [secondlife-bin llviewertexture.cpp] 2010-07-15 15:16:50 -06:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Dessie Linden 3de5be44ad Merged from viewer-release 2010-07-02 07:07:23 -07:00
Dessie Linden ef735d8393 Merged from viewer-release 2010-07-02 07:07:23 -07:00
Xiaohong Bao 26b03161f5 fix for EXT-7839: texture console is stalled; 
fix for EXT-7500: Texture Jamming problems with http texture off;
 2010-06-30 18:21:08 -06:00
Tofu Linden 8b16faec30 EXT-7543 FIXED(maybe) - crash in LLRenderPass::pushBatch 
(transplanted from 3f95c322795af28d9b8f8730b9479a8925042039)
 2010-05-29 06:18:02 +01:00
Tofu Linden 6387426c99 EXT-7543 FIXED(maybe) - crash in LLRenderPass::pushBatch 2010-05-29 06:18:02 +01:00
Tofu Linden 383d695fe6 EXT-7543 FIXED(maybe) - crash in LLRenderPass::pushBatch 2010-05-29 06:18:02 +01:00
Tofu Linden 94bddd2b44 EXT-7479 FIXED only bumpmaps of type Brightness or Darkness load on 2.0.2 (205107) 2010-05-26 16:46:55 +01:00
Tofu Linden d0a6165713 EXT-7479 FIXED only bumpmaps of type Brightness or Darkness load on 2.0.2 (205107) 2010-05-26 16:46:55 +01:00