cc44316aed
Merge LL 3.4.3,
...
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
9f4245779c
Partial Merge of LL 3.4.2 Release
2012-12-10 15:56:46 -08:00
c6a2ac0489
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20 19:43:54 -07:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
83f5d0c616
Merge in viewer-development
2012-07-31 15:42:02 -07:00
2b620b006b
Disable caching of vbo memory in LLVBOPool. Had been there once and it was a memory hog, now it's back and it's again keeping massive amounts of memory
2012-11-02 00:05:28 +01:00
509408f393
merge back beta fixes for DRTVWR-180
2012-07-14 09:30:09 -04:00
56d563ba7f
Fix merge issues - duplicate insertions of code
2012-07-11 17:14:25 -07:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
e86b1c18db
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
997b360747
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
b43e29ee66
Reapplied after merge: Fix for GCC 4.6.3 when compiling 64 bit.
2012-06-10 23:13:50 +02:00
c1e6caf23a
Backed out changeset 0cb6e34b68e5. Talked with Tonya, this needs a slightly different fix.
2012-10-14 22:02:33 +02:00
a88d1372ee
Pass the address of an array element to a function expecting a pointer.
2012-10-14 14:09:48 -05:00
034cbbdc95
User-defined names was deprecated with OpenGL 3.1. Just generate/delete using OpenGL function.
2012-09-26 21:00:25 +02:00
999bd2130e
Merge LL 3.4.0 release
2012-09-13 15:19:30 -07:00
d9c7b9253d
merge LL 3.4.0 viewer-beta
2012-08-31 00:18:30 -07:00
8cb09ca444
Merge to FS LGPL 29865
2012-08-30 15:45:02 -07:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
0fd3ff972d
MAINT-1142 use VBO pooling on OSX
2012-06-04 12:15:08 -07:00
e0b334c615
Crashfix; Change llassert_always to llassert + llwarns. This way users don't get disruptive crashes.
2012-07-21 14:18:10 +02:00
67221663fe
MAINT-616 Fix for mac build.
2012-05-30 14:55:34 -05:00
2e26dc3971
Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO accounting.
2012-05-30 13:22:04 -05:00
efda0814cb
MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.
2012-05-24 10:50:48 -05:00
78df56e1b5
MAINT-616 Fix for crash on teleport from previous changes
2012-05-22 13:49:52 -05:00
534168c452
MAINT-616 Fix for crash on shutdown caused by previous changes.
2012-05-22 00:49:07 -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
89b0b6ac71
MAINT-616 Different VBO Pooling scheme -- populate VBO pool with buffers that are likely to be requested, but never reuse a previously used buffer.
2012-05-15 16:42:04 -05:00
aca20e85fb
Crashfix; Change llassert_always to llassert + llwarns. This way users don't get disruptive crashes.
2012-07-21 14:18:10 +02:00
3894701180
MAINT-708 Fix for pink when enabling RenderUseVAO
2012-03-14 16:13:23 -05:00
3953477ee5
MAINT-708 Reduce amount of video memory consumed by vertex buffer objects.
2012-03-13 17:34:11 -05:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
4f26a67c0f
MAINT-708 Fix for pink when enabling RenderUseVAO
2012-03-14 16:13:23 -05:00
2e1067dd32
MAINT-708 Reduce amount of video memory consumed by vertex buffer objects.
2012-03-13 17:34:11 -05:00
a128836ded
SH-2908 Fix for linux build.
2012-02-23 13:41:19 -06:00
3efa013ee4
MAINT-939 Potential fix for crash when editing objects.
2012-04-13 11:55:44 -05:00
484994b43b
MAINT-870 Fix for crash from out of control lawns.
2012-04-11 12:20:03 -05:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
e07191cb7f
Backed out changeset: cab3e59e0834 (LL has a different fix for this)
2012-04-22 21:02:40 -07:00
64c89ee2c5
SH-2908 Fix for mac build
2012-02-13 15:41:21 -06: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
ae7d475aeb
SH-2794, resolved merge conflict and corrected logic in LLVertexBuffer::determineUsage() to work the way it used to.
2012-02-06 12:43:23 -08:00
344c46a20c
merge, conflicts in llvertexbuffer.{h,cpp}
2012-02-06 15:08:41 -05:00
5741b71e89
FIRE-5077; remove hardcoded limit for max. 65535 (U16 max) for broader testing.
2012-02-27 00:43:07 +01:00
17b21fc197
Fix for windows build
2012-01-26 12:50:24 -06:00
71a660e006
* Fixed up shader compilation errors to get lighting and shadows working again on Mac.
...
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.
Reviewed by davep.
2012-01-26 10:17:41 -08:00
0bbe8d73cb
SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer.
2012-01-25 15:37:36 -06:00
Tank_Master