Commit Graph

143 Commits (a4913246770b58ed569021c484c213231aaae549)

Author SHA1 Message Date
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
Dave Parks a2d08a6d80 SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and modify viewer to run under said context without generating errors. 2011-09-22 00:10:57 -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 c0ca2c62fd merge 2011-09-13 16:11:22 -05:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Dave Parks 7821ff23ba SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers. 2011-08-27 00:38:53 -05:00
Dave Parks 2ee8154780 SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed). 2011-08-10 13:01:14 -05:00
Dave Parks f076bdf609 merge 2011-08-08 15:39:02 -05:00
Dave Parks 14f6bbadef SH-2242 Work in progress migrating to glVertexAttrib everywhere 2011-08-08 15:29:23 -05:00
Nyx (Neal Orman) c07f55e605 merging latest viewer-development to mesh merge candidate. 2011-07-25 18:26:14 -04:00
Dave Parks 6469f1c2f2 SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available. 2011-07-17 00:24:08 -05:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Leslie Linden f587af0af1 Build fix for Mac OS X. 2011-07-11 15:16:56 -07:00
Dave Parks 9db49b4448 SH-2038 Disable usage of stream vbo on mac and make flexi's use stream vbo if stream vbo disabled (effectively disables usage of vertex buffers for flexible objects on mac) 2011-07-11 12:14:06 -05:00
Dave Parks b5149a63f9 SH-2038 Compatibility fix for mac build (GL_ARB_sync symbols not defined on OSX) 2011-07-11 11:41:34 -05:00
Dave Parks 268f3dbdea SH-2038 Fix for some compiler errors from the apple tweaks -- also add a fence API (disabled for now). 2011-07-10 02:29:39 -05: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
Xiaohong Bao 32f8b47497 debug code for SH-692: Viewer Crash when enabling Render Metadata > Physics Shapes on Mesh Sandbox 25 on Windows XP 2011-06-21 12:00:38 -06:00
Dave Parks dd4e506101 Followup on mapbuffer work -- only use map buffer where map_buffer_range is available, and allow non-buffer-mapping implementation to take advantage of recorded mapped regions. 2011-06-10 01:28:53 -05:00
Leslie Linden ffab1eef57 Mac build fixes.
Reviewed by davep.
2011-06-03 16:24:07 -07:00