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
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
0fd3ff972d
MAINT-1142 use VBO pooling on OSX
2012-06-04 12:15:08 -07: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
655505d304
SH-2794 Fix for bad textures on some hardware when vbo mapping disabled (always use GL_STREAM_DRAW as the usage hint when mapping is disabled as geometry will be uploaded again and again)
2012-01-19 14:57:07 -06:00
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01:00
70a35d5722
Don't use mFreeList in LLVertexBuffer. It only grows, never shrinks.
2012-01-27 21:03:37 +01:00
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08: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
e82c0561fa
SH-2652 Faster depth of field
2011-11-04 16:14:43 -05:00
4ec72ed0a6
Fix for VBO pools not getting cleared appropriately.
2011-10-19 16:19:00 -05:00
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
ae0cd901f8
SH-2428 Make GCC 4.4 happy by using LLVector4a striders with LLAlphaObject subclasses -- also vectorize particle VBO updates
2011-10-04 17:25:55 -05:00
c4aa8c50da
SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
2011-10-04 02:31:54 -05:00
ac37656aa5
SH-2276 Fix for failed assertions reported from debug-enabled viewers. Also, remove "Basic Shaders" as a user settable option (shaders are always on if GL version >= 2.0, always off otherwise)
2011-10-02 02:12:21 -05:00
1e9a492431
SH-2276 disable private memory pool management
2011-09-29 13:10:38 -05:00
5ca512fa1f
SH-2450 Potential fix for crash on GeForce 4xx when allocating LLVertexBuffer data
2011-09-28 12:38:31 -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
56191701bc
SH-2244 Fix for crash when enabling core profile on AMD GPUs
2011-09-25 02:43:43 -05:00
Tank_Master