William Todd Stinson
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
Dave Parks
096fe03786
MAINT-646 Faster traversal of render batch lists.
2012-06-01 14:27:04 -05:00
Dave Parks
2207b979eb
MAINT-622 Fix for broken alpha masking on avatar clothing when Lighting and Shadows enabled.
2012-05-30 14:44:39 -05:00
Dave Parks
523f94cca9
SH-2889 Fix for crash when encountering certain attachments.
2012-02-27 17:15:35 -06:00
Dave Parks
f7cee997df
SH-2779 Fix for some transparent rigged attachments not being rendered correctly.
2012-01-19 12:40:44 -06:00
Dave Parks
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
Leslie Linden
ad9e08b8a1
SH-2563 FIX -- Added diffuse map to the avatar rigid pass to properly set up the eyeball texture for Mac OS Lion
2011-11-15 15:52:29 -08:00
Dave Parks
2179e1c1f2
SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway.
2011-11-02 13:13:38 -05:00
Dave Parks
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
Dave Parks
cffcb414f5
SH-2488 Fix for shiny and alpha not interacting well on rigged attachments (and fix for assertion when rendering model import preview)
2011-10-07 17:44:57 -05:00
Dave Parks
328cf0d1c7
Merge cleanup
2011-09-26 20:00:38 -05:00
Dave Parks
bd02cdc75f
merge
2011-09-26 19:27:10 -05:00
Dave Parks
57620a9da9
SH-2244 Vertex buffer cleanup, fix for bad vertices in rigged attachments, added "RenderUseVAO" debug setting to control whether or not to use VAO's in non-core GL profiles.
2011-09-23 17:59:05 -05:00
Dave Parks
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
Xiaohong Bao
38c19f4e55
for SH-2242: fixes the assertion caused by gGL.diffuseColor4f when shadows is on.
2011-09-01 17:18:16 -06:00
Brad Payne (Vir Linden)
ff60546070
merge
2011-08-22 13:16:02 -04:00
Dave Parks
f7d17cad5c
SH-2188 Fix for generally bad vertex buffer updates for rigged attachments and fix for viewer always thinking meshes initially have 8 texture entries.
2011-08-17 12:55:32 -05:00
Dave Parks
364f8771ed
Merge cleanup.
2011-08-10 15:34:48 -05:00
Dave Parks
265db1f17c
merge
2011-08-10 14:50:11 -05:00
Dave Parks
17f46868d2
SH-2265 Fix for impostor alpha masking being broken.
2011-08-10 14:40:39 -05:00
Dave Parks
2ee8154780
SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed).
2011-08-10 13:01:14 -05:00
Dave Parks
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
Dave Parks
8ec39da346
SH-2181 Fix for alpha flickering when basic shaders enabled (don't use glAlphaFunc when shaders are available).
...
Reviewed by Leslie
2011-07-29 17:46:16 -05:00
Dave Parks
b3fbb12f15
SH-1589 Fix for some meshes showing up in non mesh enabled regions.
2011-06-06 19:12:52 -05:00
Dave Parks
d78ecc6c28
SH-812 Fix for rigged meshes not showing up as rigged until LoD switch.
2011-06-01 23:54:49 -05: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
713366477d
Fix for texture state corruption when rendering impostors in a reflection map or underwater and deferred rendering is enabled.
2011-03-09 17:09:35 -06:00
Dave Parks
85fb9f5c09
Fix for crash when enabling Debug GL and rendering deferred impostors.
2011-03-07 17:10:10 -06:00
Dave Parks
162d467b4a
SH-1085 Fix for crash when unchecking "mirror." Basically got LLFace to be paranoid about who gets to touch its LLVertexBuffer members.
...
Reviewed by Nyx.
2011-03-03 16:14:52 -06:00
Dave Parks
a5bc626ee3
merge
2011-02-17 17:19:13 -06: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
Dave Parks
cd582e3364
SH-547 Use appropriate texture channel for rendering avatars into their impostor map.
2011-02-17 16:06:34 -06:00
Dave Parks
b862e3adfa
SH-547 Fix for rigged attachments being invisible in impostors and fix for impostors not working with lighting and shadows enabled.
2011-02-14 18:26:12 -06:00
Loren Shih
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
Oz Linden
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
Tofu Linden
393c819477
VWR-21967 There's lots of ::renderForSelect() code that we don't need any more.
...
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
2010-10-10 15:25:11 +01:00
Dave Parks
21b1b91c44
ATI compatibility pass
2010-10-06 12:53:26 -05:00
Matthew Breindel (Falcon)
569f3f4b06
Merge
2010-09-22 13:04:53 -07:00
Dave Parks
cf09d6c58a
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
2010-09-22 03:04:21 -05:00
Brad Payne (Vir Linden)
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
Dave Parks
c42ed54b0a
Stop using ll_aligned_malloc/free in llvolume.
...
Fix for garbage data in vertex weight array crashing software skinning.
Proper integration of picking for rigged attachhments.
Optimization in LLDrawable::updateDistance (don't call updateRelativeXform, just use spatial group position).
2010-09-20 18:45:56 -05: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
Dave Parks
314a895357
Software fallback for avatar vertex skinning.
...
Reviewed by Nyx.
2010-08-19 16:48:15 -05:00
Dave Parks
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
Dave Parks
62943202a7
Make rigged attachments respect under water rendering.
...
Reviewed by Nyx.
2010-08-13 14:42:07 -05: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
ddd7a3ebb5
Make rigged attachments respect "Show me in mouselook" option.
2010-08-12 11:40:54 -05:00