8b4b2e375d
Fix for line endings style (dos2unix).
...
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-03 15:31:30 -04:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
12b0b52b99
merge
2011-04-19 12:37:27 -05:00
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
897a4668bd
SH-1320 Fix for flickering objects in water distortion/reflection maps.
2011-04-08 01:24:17 -05:00
b5c834c6fd
merge changes for STORM-1051
2011-04-05 07:23:43 -04:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
719610e68b
SH-1225 Import convex hull data from .slm
2011-03-29 11:50:02 -05:00
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
e3e12bc3df
SH-874 Followup -- fix for mac build
2011-03-10 11:55:46 -06:00
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
ca610bfc82
merge
2011-03-10 00:42:08 -06:00
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
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
075b1af62a
STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error)
2011-03-08 17:00:39 -08:00
76a325b832
STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error)
2011-03-08 17:00:39 -08:00
a313cedd69
fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
...
reviewed by davep
2011-03-07 15:02:48 -07:00
e64096da69
fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
...
reviewed by davep
2011-03-07 15:02:48 -07:00
3f6208b176
Merge
2011-02-24 16:20:43 -07:00
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
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
9b50def44f
Automated merge up from viewer-development into mesh-development
2011-02-23 12:50:17 -05:00
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
97eb1b9da4
Merge with viewer-development
2011-02-22 21:27:47 +00:00
417069f152
more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking.
2011-02-22 11:22:50 -07:00
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
9e0ee4dff0
SH-1006 Quick pass at cutting down the number of redundant GL calls based on data from gDEBugger.
...
Reviewed by Nyx.
2011-02-17 17:18:57 -06:00
f13884e528
partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking.
2011-02-15 14:12:58 -07:00
10518eaaae
SH-874 Revert much of the bad water bounding box and distortion texture usage changes from SNOW-643 and properly occlusion cull void water patches for machines without depth clamp.
2011-02-09 16:53:47 -06:00
9cd092544f
SH-545 [REGRESSION] Enabled Basic Shaders Can Cause an Unrecoverable System Lock Up
...
originally done in http://bitbucket.org/leyla/leyla-mesh-development
2011-02-08 15:00:42 -08:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
ba1266043f
trivial: for VWR-22353: remove debug code for EXT-6791.
2011-01-07 15:04:36 -07:00
875d36b083
merge
2011-01-05 01:23:37 -06:00
1e647e2cd2
Faster occlusion queries (take advantage of GL_ARB_occlusion_query2 where available and don't read back result if it will block).
2010-12-31 18:41:54 -06:00
57153cf0f1
SH-655 - Project mesh viewer crashes on exit.
...
A copy constructor was implemented which did a memcpy,
which included the vtable pointer which was to another object of another
class (same child though). This resulted in the wrong destructor
being called.
The reason for the memcpy was for alignment purposes.
The solution was to move to LLVector4a, which is intrinsicly aligned.
Also, did some performance optimizations based on the LLVector4a optimizations.
The solution was to re-implement the
2010-12-23 01:48:44 -08:00
03fa20eb0e
merge
2010-12-10 15:27:04 -06:00
0ae6e2b451
Reskin model importer according to latest spec, add extra LoD decimation parameters.
2010-12-10 15:18:26 -06:00
06cf9d0820
Fixes for OSX 10.5 SDK builds
2010-12-09 17:46:51 -08:00
3daaf4597d
Add extern declarations of GL_ARB_framebuffer_object to glheades.h
2010-12-03 03:54:24 -06:00
48b107ac97
Apparently the new standard is to NOT suffix ARB extension function pointers with ARB.
2010-12-03 02:37:14 -06:00
0be7fcf2a9
SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02 21:33:03 -06:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
cae0544519
merge
2010-10-28 17:43:39 -05:00
798ba26952
More aggressive management of FBOs. Allocate as few FBOs as possible, assert when FBOs are destroyed out of order.
2010-10-28 17:39:45 -05:00
90c2c4a9bc
SH-392 Port over fix from mesh-development for FBOs on OSX
2010-10-27 16:19:18 -05:00
639bb11eef
Automated merge from viewer-development-shining
2010-10-27 16:19:18 -04:00
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
b3c06e6a74
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:49 -05:00
2504824d59
Fix for crash when toggling anisotropic filtering.
2010-10-21 14:24:49 -05:00
Loren Shih