a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
219cd6ecda
more debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer.
2010-10-14 21:23:23 -06:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
c3764eaf87
add debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer
2010-10-12 15:38:52 -06:00
569f3f4b06
Merge
2010-09-22 13:04:53 -07:00
7d625ef060
merge
2010-09-22 01:44:44 -05:00
61257991ba
Stop using aligned malloc in llvertexbuffer (tcmalloc is automagically aligned).
2010-09-22 01:43:22 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
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
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
340a729d55
Vertex buffer cleanup, adding water shader to simple rigged attachments.
...
Reviewed by Nyx.
2010-08-12 17:05:40 -05:00
13202e744c
merge
2010-07-14 11:11:31 -05:00
46768c3c6c
Merge?
2010-07-12 07:39:23 -05:00
67f0a792a2
Merged from viewer-release
2010-06-30 12:03:06 -07:00
070311d5cc
Merged from viewer-release
2010-06-30 12:03:06 -07:00
ea0192f157
Line endings.
2010-06-28 16:11:22 -05:00
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
51c8c74da5
Merged from viewer-release
2010-06-11 15:04:21 -07:00
d50a34e6e3
Merged from viewer-release
2010-06-11 15:04:21 -07:00
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
f9b13d8f85
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
2010-06-10 00:45:48 -05:00
9878c02404
add some #includes for our wrappers
2010-06-04 09:07:25 +01:00
f40d07512a
finish conversion to ll_aligned_*() wrappers
2010-06-04 09:04:36 +01:00
0c8164b894
Fix for useVBOs being busted when sEnableVBOs gets flipped.
...
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
(transplanted from 11bf20602885c3d2d42d8a7f7361d2005a708b5c)
2010-06-04 00:09:52 -05:00
3906a4eb1d
Fix for useVBOs being busted when sEnableVBOs gets flipped.
...
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
2010-06-04 00:09:52 -05:00
697e7a3b0c
Fix for useVBOs being busted when sEnableVBOs gets flipped.
...
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
2010-06-04 00:09:52 -05:00
a4ce5c9eaa
Fix for useVBOs being busted when sEnableVBOs gets flipped.
2010-06-04 00:09:52 -05:00
051d55e9e4
Terrain is no longer mutilated.
2010-05-24 23:34:50 -05:00
cb487c002a
Merge
2010-05-24 15:04:49 -05:00
7eba473723
Fix for bad indexes on cube faces.
...
Extra validation on vertex buffers.
2010-05-24 14:01:18 -05:00
a3075d8837
fix a tiny subset of the current build errors
2010-05-24 11:28:13 +01:00
e90d2f88e5
Aligned index buffers.
2010-05-21 14:31:17 -05:00
05a23f8dba
Vectorized memcpy.
...
16-byte aligned vertex buffers.
(almost) fully vectorized avatar vertex buffer updating --- index buffers still need to be vectorized
2010-05-21 04:49:12 -05:00
c074404d9d
Que?
2010-04-22 14:44:34 -05:00
54dd30cc42
More rigged attachments work.
2010-04-15 00:04:17 -05:00
fc0bbcbc26
rigged attachments WIP
2010-03-25 19:22:08 -05:00
ea6397fe49
Optimiziation pass.
...
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers.
2010-03-04 15:30:15 -06:00
b414b5067e
Remove some dead code.
...
Add LH transform to LLVector3
Add DebugShowUploadCost
Make LOD generation on model preview less finnicky.
Remove error level based LOD generation.
Better framing of model before upload.
Better error handling for model uploader.
Remove [COST] argument from model upload menu item.
Remove L$ check from model upload menu item being enabled.
2010-02-28 16:40:30 -06:00
eb5b0f2542
Optimiziation pass.
...
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers.
2010-03-04 15:30:15 -06:00
4ffac61994
Optimiziation pass.
...
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers.
2010-03-04 15:30:15 -06:00
05e15ccb82
merge from viewer2.
2010-02-04 11:44:11 +00:00
48a3e84937
CID-291
...
Checker: UNINIT_CTOR
Function: LLVertexBuffer::LLVertexBuffer(unsigned int, int)
File: /indra/llrender/llvertexbuffer.cpp
also added some sanity-checking around this.
2010-02-03 18:52:20 +00:00
5a34cf1af8
Merge from viewer2 trunk.
2010-01-28 12:48:48 -08:00
68422d9505
CID 159
...
CID 158
CID 157
Checker: OVERRUN_STATIC
Function: LLVertexBuffer::drawRange(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int) const
File: /indra/llrender/llvertexbuffer.cpp
2010-01-27 14:15:02 -08:00
b9852dde4b
Merge.
2010-01-13 14:16:24 -08:00
41daf99e19
DEV-44675 Fix for sky wierdness on ATI 9.12 drivers.
2010-01-12 12:01:18 -06:00
0c50236a94
CTS-26 Fix for LOD generation always using first file specified.
2009-11-13 08:59:12 -06:00
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
Loren Shih