William Todd Stinson
c6a2ac0489
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20 19:43:54 -07:00
Dave Parks
7fc702dc49
reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on teleport.
2012-09-20 10:00:58 -04:00
Dave Parks
b5e71964e5
reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes.
2012-09-20 10:00:56 -04:00
Dave Parks
cf98064700
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
2012-09-20 09:48:55 -04:00
Brad Payne (Vir Linden)
d52c1c1c68
Fixing merge conflicts related to restoring DRTVWR-167 changes
2012-09-12 16:37:13 -04:00
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
Brad Payne (Vir Linden)
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
Brad Payne (Vir Linden)
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
Oz Linden
3803a5b5ae
pull back fixes for 3.3.4-beta4
2012-07-17 13:21:36 -04:00
Dave Parks
ccac47c1a7
MAINT-1223 Fix for alpha updates not triggering LoD updates.
2012-07-16 14:31:15 -05:00
Oz Linden
509408f393
merge back beta fixes for DRTVWR-180
2012-07-14 09:30:09 -04:00
simon@Simon-PC.lindenlab.com
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
Dave Parks
997b360747
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
Xiaohong Bao
266209b6a3
trivial: convert to Unix line endings.
2012-07-06 14:44:50 -06:00
Oz Linden
2c3e78f1f1
merge changes for DRTVWR-167
2012-06-27 14:18:22 -04:00
Dave Parks
a1d0d67e05
MAINT-775 Fix for particle index pool corruption on teleport.
2012-06-15 16:07:06 -05:00
Dave Parks
93fcff2b24
MAINT-646 Cleanup some warnings from previous changes.
2012-06-14 14:54:54 -05:00
Xiaohong Bao
52411f83a1
fix for MAINT-758: [PUBLIC]texture discard level is inconsistent between sessions
2012-06-14 12:01:21 -06:00
Dave Parks
92ee373e45
MAINT-646 Factor std::set out of lloctree
2012-06-05 12:55:17 -05:00
Brad Payne (Vir Linden)
542975b4c6
merge
2012-06-04 16:19:18 -04:00
Brad Payne (Vir Linden)
6ee0456220
merge
2012-06-04 15:28:08 -04:00
Dave Parks
defbd61d31
MAINT-639 Fix for random rainbow effects on some prims.
2012-05-31 13:25:19 -05:00
Xiaohong Bao
957bfcd5d9
fo SH-3074: clear ghost and stale texture fetching requests in time.
2012-05-29 18:02:11 -06:00
Dave Parks
6fe9b45db2
Fix for linux build.
2012-05-22 00:03:56 -05:00
Dave Parks
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
Oz Linden
fa6add3fcd
merge changes for drtvwr-132
2012-04-03 11:28:56 -04:00
Oz Linden
38ad8611c9
MAINT-710: Fix for VertexBufferStrider could not find valid vertex data. (from Firestorm)
2012-03-27 10:55:15 -04:00
Dave Parks
423659c680
MAINT-775 Particle vertex buffer management optimizations
2012-05-02 15:45:38 -05:00
Nat Goodspeed
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04:00
Dave Parks
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
Brad Payne (Vir Linden)
635a264e6f
merge
2012-02-08 11:22:52 -05:00
Dave Parks
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
Brad Payne (Vir Linden)
c0fffdea88
SH-2789 WIP
2012-01-12 16:11:06 -05:00
Dave Parks
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
Dave Parks
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
Dave Parks
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
Dave Parks
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
Dave Parks
b9926e8f57
SH-2244 Better VAO support -- still slower than non-VAO implementation for some reason
2011-09-23 02:29:53 -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
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
Dave Parks
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
Leslie Linden
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
Don Kjer
e4d0d62e71
Added support for apple flush buffer range
2011-07-09 22:30:30 -07:00
Dave Parks
f1443579b3
SH-2038 Potential fix for a myriad of performance problems concering VBO usage.
2011-07-09 02:28:34 -05:00
Dave Parks
91fe50ecc7
SH-1802 Fix for disappearing meshes under some circuimstances.
2011-06-09 17:03:53 -05:00
Dave Parks
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
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
Dave Parks
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
Dave Parks
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
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