Commit Graph

163 Commits (49caededb4bf5beb8b87ebee034c1d969968af4d)

Author SHA1 Message Date
Nyx Linden 49caededb4 BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa 2012-09-19 17:05:56 +00:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Oz Linden 509408f393 merge back beta fixes for DRTVWR-180 2012-07-14 09:30:09 -04:00
simon@Simon-PC.lindenlab.com 56d563ba7f Fix merge issues - duplicate insertions of code 2012-07-11 17:14:25 -07: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 e86b1c18db MAINT-794 Fix for assert on loading some types of objects before their parents. 2012-07-11 15:17:13 -05: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
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Aura Linden 0fd3ff972d MAINT-1142 use VBO pooling on OSX 2012-06-04 12:15:08 -07:00
Dave Parks 67221663fe MAINT-616 Fix for mac build. 2012-05-30 14:55:34 -05:00
Dave Parks 2e26dc3971 Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO accounting. 2012-05-30 13:22:04 -05:00
Dave Parks efda0814cb MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback. 2012-05-24 10:50:48 -05:00
Dave Parks 78df56e1b5 MAINT-616 Fix for crash on teleport from previous changes 2012-05-22 13:49:52 -05:00
Dave Parks 534168c452 MAINT-616 Fix for crash on shutdown caused by previous changes. 2012-05-22 00:49:07 -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
Dave Parks 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
Dave Parks 3894701180 MAINT-708 Fix for pink when enabling RenderUseVAO 2012-03-14 16:13:23 -05:00
Dave Parks 3953477ee5 MAINT-708 Reduce amount of video memory consumed by vertex buffer objects. 2012-03-13 17:34:11 -05:00
Dave Parks 3efa013ee4 MAINT-939 Potential fix for crash when editing objects. 2012-04-13 11:55:44 -05:00
Dave Parks 484994b43b MAINT-870 Fix for crash from out of control lawns. 2012-04-11 12:20:03 -05:00
Dave Parks a128836ded SH-2908 Fix for linux build. 2012-02-23 13:41:19 -06:00
Dave Parks 64c89ee2c5 SH-2908 Fix for mac build 2012-02-13 15:41:21 -06: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
Leslie Linden 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
Brad Payne (Vir Linden) 344c46a20c merge, conflicts in llvertexbuffer.{h,cpp} 2012-02-06 15:08:41 -05:00
Dave Parks 17b21fc197 Fix for windows build 2012-01-26 12:50:24 -06:00
Leslie Linden 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
Dave Parks 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
Dave Parks 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
Dave Parks 0c1fc78bd9 SH-2794 Map buffer now performs as well as buffersubdata 2012-01-18 12:40:11 -06:00
Dave Parks 5546041301 SH-2794 WIP -- work on getting glMapBuffer and friends to behave 2011-12-21 15:55:14 -06:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Richard Linden d089e6c264 bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08: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 e82c0561fa SH-2652 Faster depth of field 2011-11-04 16:14:43 -05:00
Dave Parks 4ec72ed0a6 Fix for VBO pools not getting cleared appropriately. 2011-10-19 16:19:00 -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 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
Dave Parks 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
Dave Parks 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
Dave Parks 1e9a492431 SH-2276 disable private memory pool management 2011-09-29 13:10:38 -05:00
Dave Parks 5ca512fa1f SH-2450 Potential fix for crash on GeForce 4xx when allocating LLVertexBuffer data 2011-09-28 12:38:31 -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 56191701bc SH-2244 Fix for crash when enabling core profile on AMD GPUs 2011-09-25 02:43:43 -05:00
Dave Parks 4f2b20a30d SH-2244 Fix for mac build? (take two) 2011-09-23 20:47:55 -05:00
Dave Parks 4821a22070 SH-2244 Fix for mac build? 2011-09-23 18:29:38 -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 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 d3f614e2e9 SH-2244 fix flickering shadows and occlusion culling. 2011-09-22 13:41:26 -05:00
Dave Parks 3115e250ff SH-2244 Don't use VAO's outside of core profile (performance improvement) 2011-09-22 00:57:47 -05:00