Commit Graph

431 Commits (e92d3dcf1013ab340fdef514b41ebf790f79e04c)

Author SHA1 Message Date
Dave Parks b9b1500979 SH-1618 Fix for shaders being disabled on mac due to switch statement in indexed texture rendering code. 2011-06-20 11:55:22 -05:00
Dave Parks 44f0a1b681 SH-1778 Physics shape display fix up. 2011-06-11 16:51:01 -05: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
Dave Parks 690f18c948 merge 2011-06-07 13:59:40 -05:00
Dave Parks 70f959f01e SH-1738 Fix for broken UI text when deferred rendering enabled. 2011-06-06 02:41:09 -05:00
Leslie Linden ffab1eef57 Mac build fixes.
Reviewed by davep.
2011-06-03 16:24:07 -07:00
Richard Linden 960e8c05cb Automated merge with http://hg.secondlife.com/viewer-development 2011-06-02 13:35:15 -07:00
seth_productengine d4e09e81ca Linux build fix.
Unused local varible removed.
2011-06-02 17:03:51 +03: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 ece32418e7 SH-1682 Dynamically adjust the number of texture channels to use for indexed texture rendering based on available hardware. 2011-05-31 14:35:59 -05:00
Dave Parks eca17c8993 SH-1682 Full integration if indexed texture rendering to improve batch size. 2011-05-30 01:25:55 -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
Richard Linden 2595d53ded Automated merge with http://hg.secondlife.com/viewer-development 2011-05-25 18:14:55 -07:00
Richard Linden a8405dea54 EXP-829 FIX Text Box Alignment bug
EXP-755 FIX [PUBLIC] 'Search' and 'World Map' links in Sidebar are unclickable

fixed issues with UI scaling and text layout as well as incorrect text editor rect transforms


reviewed by Callum
2011-05-25 18:10:58 -07:00
Dave Parks 3a2c3a45aa Remove unused variable. 2011-05-25 19:23:41 -05:00
Dave Parks 9eea451a82 SH-469 Don't use depth buffers and multisample buffers where not absolutely needed -- make sample counts consistent between shaders and render targets. 2011-05-25 15:51:15 -05:00
Dave Parks 4353eeb928 SH-469 GL_ARB_texture_multisample support 2011-05-24 15:29:33 -05:00
Dave Parks fd574e3485 merge 2011-05-19 20:42:56 -05:00
Dave Parks 51bb3c15c8 SH-469 WIP -- get rid of LLMultiSampleBuffer and use GL_ARB_texture_multisample instead. 2011-05-19 20:38:39 -05:00
Leslie Linden 19a06478d9 SH-1618 FIX -- Lighting and shadows crash ATI macs
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
  the use of glEnable/glDisable on textures above the texture unit count
  and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.

Reviewed by davep
2011-05-19 17:28:23 -07:00
Dave Parks 8017900e7f merge 2011-05-12 18:50:22 -05:00
brad kittenbrink 2a843e9a6b Fix up alignment problems for debug build.
reviewed by davep.
2011-05-12 16:09:42 -07:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
Leslie Linden a52019d6d1 SH-1521 FIX -- Lighting and Shadows grayed out on mac
* Modified mac feature table to bring it up to date with latest renderer features including deferred rendering
* Changed mac AGL pixel format to no longer allow it to revert to software rendering when shader compilation errors occur.
* Fixed up various GLSL shader compilation warnings and errors that came up as a result of the above changes.
* Changed initial conditions for the "hardware skinning" checkbox on the preferences floater so it can be modified before login on machines that support avatar vertex programs.
* Removed unused avatarAlphaF.glsl files

Reviewed by davep
2011-05-10 14:34:36 -07:00
Loren Shih 8b4b2e375d Fix for line endings style (dos2unix).
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-03 15:31:30 -04:00
brad kittenbrink d4b9db012e FIX VWR-25609: crash on shutdown in LLGLNamePool::sInstances destructor 2011-04-26 15:04:22 -07:00
Oz Linden b5c834c6fd merge changes for STORM-1051 2011-04-05 07:23:43 -04:00
Merov Linden d3b192c26f STORM-1090 : Fix for use of freetype 2.4.4 and switch to freetype 2.4.4 in installables 2011-03-23 13:39:31 -07:00
Merov Linden 075b1af62a STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error) 2011-03-08 17:00:39 -08:00
Xiaohong Bao e64096da69 fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
reviewed by davep
2011-03-07 15:02:48 -07:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Dave Parks 12b0b52b99 merge 2011-04-19 12:37:27 -05:00
Dave Parks 8275820df0 SH-1301 Add some extra asserts around VBO usage to try and narrow down a crash. 2011-04-15 14:11:48 -05:00
Dave Parks 897a4668bd SH-1320 Fix for flickering objects in water distortion/reflection maps. 2011-04-08 01:24:17 -05:00
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Dave Parks 719610e68b SH-1225 Import convex hull data from .slm 2011-03-29 11:50:02 -05:00
Dave Parks e3e12bc3df SH-874 Followup -- fix for mac build 2011-03-10 11:55:46 -06:00
Dave Parks 666f06eace SH-874 Followup -- use GL_NVX_gpu_memory_info for NVIDIA chips to detect actual installed and available VRAM. 2011-03-10 11:46:16 -06:00
Dave Parks ca610bfc82 merge 2011-03-10 00:42:08 -06:00
Dave Parks 5fd953df8f SH-874 Properly detect available video memory on ATI cards and disable vertex buffer objects when available vram is under 256MB. 2011-03-10 00:41:46 -06:00
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -05:00
Merov Linden 76a325b832 STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error) 2011-03-08 17:00:39 -08:00
Xiaohong Bao a313cedd69 fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
reviewed by davep
2011-03-07 15:02:48 -07:00
Xiaohong Bao 3f6208b176 Merge 2011-02-24 16:20:43 -07:00
Loren Shih 3d77dd6b58 Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually. 2011-02-23 16:24:47 -05:00
Xiaohong Bao 609c70eb5a separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.
reviewed by davep.
2011-02-23 11:41:13 -07:00
Loren Shih 9b50def44f Automated merge up from viewer-development into mesh-development 2011-02-23 12:50:17 -05:00
Dave Parks e55e91a5a5 SH-874 Better VBO usage hints, most notably don't use VBOs for occlusion queries if GL is set to not use VBOs for stream draw. 2011-02-22 18:36:50 -06:00
Don Kjer 97eb1b9da4 Merge with viewer-development 2011-02-22 21:27:47 +00:00
Xiaohong Bao 417069f152 more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-22 11:22:50 -07:00