3803a5b5ae
pull back fixes for 3.3.4-beta4
2012-07-17 13:21:36 -04:00
ccac47c1a7
MAINT-1223 Fix for alpha updates not triggering LoD updates.
2012-07-16 14:31:15 -05:00
509408f393
merge back beta fixes for DRTVWR-180
2012-07-14 09:30:09 -04:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
997b360747
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
266209b6a3
trivial: convert to Unix line endings.
2012-07-06 14:44:50 -06:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
e86b1c18db
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
2c3e78f1f1
merge changes for DRTVWR-167
2012-06-27 14:18:22 -04:00
a1d0d67e05
MAINT-775 Fix for particle index pool corruption on teleport.
2012-06-15 16:07:06 -05:00
93fcff2b24
MAINT-646 Cleanup some warnings from previous changes.
2012-06-14 14:54:54 -05:00
52411f83a1
fix for MAINT-758: [PUBLIC]texture discard level is inconsistent between sessions
2012-06-14 12:01:21 -06:00
92ee373e45
MAINT-646 Factor std::set out of lloctree
2012-06-05 12:55:17 -05:00
542975b4c6
merge
2012-06-04 16:19:18 -04:00
6ee0456220
merge
2012-06-04 15:28:08 -04:00
defbd61d31
MAINT-639 Fix for random rainbow effects on some prims.
2012-05-31 13:25:19 -05:00
fdb0218bfc
Crashfix; Guard against 0 pointer textures.
2012-10-22 15:40:18 -04:00
957bfcd5d9
fo SH-3074: clear ghost and stale texture fetching requests in time.
2012-05-29 18:02:11 -06:00
6fe9b45db2
Fix for linux build.
2012-05-22 00:03:56 -05:00
b7cfd8c7f0
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
2012-05-21 23:33:25 -05:00
fa6add3fcd
merge changes for drtvwr-132
2012-04-03 11:28:56 -04:00
38ad8611c9
MAINT-710: Fix for VertexBufferStrider could not find valid vertex data. (from Firestorm)
2012-03-27 10:55:15 -04:00
423659c680
MAINT-775 Particle vertex buffer management optimizations
2012-05-02 15:45:38 -05:00
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04:00
3710c6110d
SH-2908 Rework indexed texture rendering to use a uvec4 instead of a float for texture indices in the data stream. Also rework gl_FragColor overrides to not collide with some odd driver implementations.
2012-02-10 20:04:19 -06:00
635a264e6f
merge
2012-02-08 11:22:52 -05:00
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
c0fffdea88
SH-2789 WIP
2012-01-12 16:11:06 -05:00
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
5c690db63f
SH-2700 Fix for random black textures due to texture index out of bounds. Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future.
2011-11-18 15:04:26 -06:00
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
54ba56dbe9
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
2011-09-26 18:31:55 -05:00
b9926e8f57
SH-2244 Better VAO support -- still slower than non-VAO implementation for some reason
2011-09-23 02:29:53 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
c337888553
SH-2031 Disable usage of glMapBuffer (again). Despite using MapBufferRange, this is still a source of frame stalls.
2011-07-22 01:07:48 -05:00
76249c58f6
SH-2038 FIX -- [PUBLIC] Severe performance drop on MacBook Pros
...
EXP-997 FIX -- Significant FPS degradation in 2.8.0 Beta on Mac equipped ATI video card
* Disabled VBO's on mac to avoid stalls in renderer
* Placed valid data into the padding between triangles in the vertex buffer to remove uninitialized craziness
* Removed invalid rendering checks causing GL errors in debug mode
Reviewed by davep
2011-07-19 13:31:32 -07:00
e4d0d62e71
Added support for apple flush buffer range
2011-07-09 22:30:30 -07:00
f1443579b3
SH-2038 Potential fix for a myriad of performance problems concering VBO usage.
2011-07-09 02:28:34 -05:00
91fe50ecc7
SH-1802 Fix for disappearing meshes under some circuimstances.
2011-06-09 17:03:53 -05:00
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
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
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
b98a17c825
SH-1443 Fix for fullbright alpha objects not appearing for some combinations of deferred rendering and non deferred automatic alpha mask toggling.
2011-04-28 16:40:06 -05:00
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
00c861f967
SH-1085 Fix for crash when disabling "mirror" and a face is selected.
2011-03-08 14:14:33 -06:00
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
5bd5d918ca
merge
2011-02-02 19:03:03 -06:00
bb113f75ef
SH-900 Fix for only lowest LoD appearing for objects in neighboring regions.
2011-02-02 19:01:27 -06:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
4af7e9eb64
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
2011-01-21 16:25:23 -07:00
c602fed9b7
fix for SH-659: small textures not loaded
2011-01-18 14:08:21 -07:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
892d70f5d5
Prune ll_aligned_malloc/free calls out of lldrawable and llface
2010-11-21 03:48:11 -06:00
e8a92e6910
Fix for sometimes missing the color value on last vertex of a face.
2010-10-29 12:06:45 -05:00
94c2e4c0ae
Fix for NAN getting copied for some color values (NAN is purple).
2010-10-28 17:40:28 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
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
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
b7cf948a82
SH-213 Fix for crash when selecting face.
2010-09-24 13:39:15 -05:00
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
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
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
90da6d6fdc
Raycasting for rigged attachments now works for your own attachments while in edit mode.
2010-09-19 23:07:15 -05:00
7399c39a2f
Fix for crash when loading models (Don't hit UI from the main thread). Added asserts to LLFastTimer to verify main thread use only.
2010-09-02 19:13:48 -05:00
1c286f6b0b
Merge cleanup.
2010-08-31 18:10:02 -05:00
e68f9e566b
merge
2010-08-31 16:37:40 -05:00
838c01e87d
re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)
2010-08-26 14:34:50 -04:00
2f012dd34f
merge
2010-08-25 14:48:18 -05: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
b2b670d787
VWR-20752 (SNOW-586) Align planar-mapped textures across different faces.
...
Port of svn changset 3458 from Snowglobe, with minor tweaks.
2010-08-21 01:41:27 +03:00
834f2fa6a5
merge from viewer-release
2010-08-20 12:16:46 -07:00
bb8919c013
merge from viewer-release
2010-08-20 12:16:46 -07:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
247ca1660b
EXT-8673: FIXED: UDP texture loading is slower in 2.x viewers than 1.23.5
...
Improved the following:
1, make sure the texture callback queue is properly handled and cleaned in time;
2, estimate the LLVOTree pixel area more accurately;
3, eliminate the possibility of back and forth stopping/restarting a texture fetching
2010-08-18 11:33:01 -06:00
3ac134ec22
EXT-8673: FIXED: UDP texture loading is slower in 2.x viewers than 1.23.5
...
Improved the following:
1, make sure the texture callback queue is properly handled and cleaned in time;
2, estimate the LLVOTree pixel area more accurately;
3, eliminate the possibility of back and forth stopping/restarting a texture fetching
2010-08-18 11:33:01 -06:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
572e72d8a1
merge
2010-07-20 11:31:23 -07:00
fde4edf75d
merge
2010-07-20 11:31:23 -07:00
bab5ef916c
trivial: replace some very small constant numbers with "F_ALMOST_ZERO".
2010-07-19 15:20:23 -06:00
46768c3c6c
Merge?
2010-07-12 07:39:23 -05:00
9ed825fe5a
Line endings fix.
2010-06-17 12:47:17 -05:00
fa7d983f08
Add timer for comparison against davep/viewer-release
2010-06-17 12:44:49 -05:00
f9b13d8f85
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
2010-06-10 00:45:48 -05:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05:00
c13c38e25e
unused vars whine.
2010-06-04 09:24:22 +01:00
f40d07512a
finish conversion to ll_aligned_*() wrappers
2010-06-04 09:04:36 +01:00
22b62c1a5b
Slightly faster position transformations.
2010-06-04 00:11:37 -05:00
26ba00b555
Vectorized octree and much of llspatialpartition and lldrawable.
...
Octree driven raycast.
2010-06-03 12:52:28 -05:00
0a54fb6b24
Faster texture coordinate updates.
2010-05-29 04:19:25 -05:00
82c7088932
merge
2010-05-26 15:05:28 -05:00
bac3623e26
Faster index buffer copying.
2010-05-26 14:55:29 -05:00
fe2419b71a
I couldn't convince GCC that these wouldn't be used uninitialized, so init them (it's outside of the vertex loop at least). Also fix some other gcc whines.
2010-05-26 17:31:58 +01:00
c98b1b3fd9
Fully aligned llvolume
2010-05-26 03:29:19 -05:00
e6fe3b1f1a
Better vectorization of various things. Turn off debug gl by default.
2010-05-25 03:55:01 -05:00
051d55e9e4
Terrain is no longer mutilated.
2010-05-24 23:34:50 -05:00
7eba473723
Fix for bad indexes on cube faces.
...
Extra validation on vertex buffers.
2010-05-24 14:01:18 -05:00
4d57cb3c09
Vectorize/memory align buffers in llvolumeface WIP
2010-05-22 04:35:02 -05:00
191fc90954
merge from viewer-public
2010-05-20 11:47:15 +01:00
9c779e222e
merge from viewer-public
2010-05-20 11:47:15 +01:00
13d2501c84
SNOW-207/DEV-42245 : FIXED : Texture loading on sculpty plants is failing making content appear to be of poor quality.
...
Patch by Thickbrick, reviewed by me.
2010-05-20 11:38:57 +01:00
d58ef90a02
explicit castfu for gcc.
2010-05-19 10:26:33 +01:00
387b7adbc4
Take a stab at baked sunlight to help low end hardware.
2010-05-18 16:59:01 -05:00
2f95a549a3
Fullbrigt skinned and fix for silly crash from not removing face references.
2010-05-01 01:55:21 -05:00
f324787a70
Rigged attachment integration WIP.
2010-05-01 00:45:44 -05:00
31a358ac1d
Fix for crash when logging in next to folks wearing rigged attachments.
2010-04-27 02:53:50 -05:00
64112134be
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
2010-04-26 14:42:06 +01:00
0655104fa2
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
...
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-04-26 14:42:06 +01:00
9e51aa3fd6
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
...
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-04-26 14:42:06 +01:00
663725dcee
Remove calls to llpushcallstacks from inner loops.
2010-04-14 12:02:25 -05:00
47ffcdb93d
Rigged attachments (almost works).
2010-04-06 16:24: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
5ba0c01ae8
merge with viewer 2 (fix windows build)
2010-02-24 10:33:14 -08:00
245fe3edc6
Fix compiler complaints about signed/unsigned mismatch
2010-02-23 23:02:20 -08:00
9cfae239a9
viewer2 merge.
2010-02-12 19:24:36 +00:00
fb994809f4
fix for EXT-5353: prim visibility issues.
2010-02-11 14:58:08 -08:00
19962a7833
merge.
2010-02-11 11:20:15 +00:00
44cfa948c7
merge.
2010-02-11 11:19:51 +00:00
60cb3f8fd2
fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() sometimes returns bad values.
2010-02-10 18:08:00 -08:00
fb248e7ad0
Fix for U16 dumbness (can have > 64K indices)
2010-02-10 14:47:53 -06:00
1f24e27956
Fix for U16 dumbness (can have > 64K indices)
2010-02-10 14:47:53 -06:00
1d66e3a1fb
CID-69
...
Checker: FORWARD_NULL
Function: LLFace::switchTexture(LLViewerTexture *)
File: /indra/newview/llface.cpp
not a bug.
2010-02-10 18:11:35 +00:00
54ba657e17
CID-71
...
Checker: FORWARD_NULL
Function: LLFace::getGeometryVolume(const LLVolume &, const int &, const LLMatrix4 &, const LLMatrix3 &, const unsigned short &)
File: /indra/newview/llface.cpp
2010-02-10 18:07:54 +00:00
6d4b4762d1
merge
2010-02-09 11:23:33 -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
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
adf601ef1f
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
095a5e8440
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
5a34cf1af8
Merge from viewer2 trunk.
2010-01-28 12:48:48 -08:00
8bf32990fc
CID-367
...
Checker: UNINIT_CTOR
Function: LLFace::LLFace(LLDrawable *, LLViewerObject *)
File: /indra/newview/llface.h
2010-01-27 16:45:42 -08:00
c6aaf115ad
Quick 'n dirty prioritization scheme for mesh loading.
...
Sprinkling of fast timers in areas that are likely to stall.
2009-12-16 09:26:53 -06:00
85488f5414
Merge of viewer 2 changes
2009-12-07 16:03:56 -08:00
7d3b3cc474
Linker optimization - use "extern template" for commonly regenerated templates
...
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
53495d74ee
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-17 13:40:11 -08:00
6f3536d597
Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info
2009-11-11 15:16:49 -08:00
0f6242d9fd
Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
...
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
afe6350160
merge from texture-pipeline
2009-11-06 12:15:41 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
abf77532d8
fix the bug that textuer boost level is mixed with boolean numbers.
2009-11-03 19:42:52 -07:00
b81feb6ae7
Merge of viewer-2-0 changes
2009-11-02 14:16:08 -08:00
3e80fa3dbc
Sync up with render-pipeline-7 ignore-dead-branch
2009-11-02 19:55:37 +00:00
99d9712dd7
additional fix for DEV-41913: parcel media does not display on particle textures.
2009-11-01 17:27:25 -07:00
801301c435
fix DEV-41913: parcel media does not display on particle textures.
2009-10-30 21:22:47 -06:00
b403745bfe
Extra debugging info for EXT-1456
...
Reviewed by Bao
2009-10-27 11:44:23 -07:00
c2ddcfae49
fix for EXT-1328: Alpha textures are not displayed correctly when first loaded.
...
to be reviewed by davep.
2009-10-12 05:32:52 +00:00
b1a280841e
fix for DEV-40559: viewer crash when media texture appears while parcel media is loading.
2009-10-03 00:23:01 +00:00
cf9239cabc
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
...
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
Oz Linden