80299bcd50
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-18 15:27:36 -07:00
05cff1ad7f
fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-18 15:26:30 -07:00
122691b836
merge
2012-01-18 12:41:40 -06:00
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
837e38d819
trivial: debug code for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-05 21:26:35 -07:00
a3e30250e8
merge
2012-01-04 09:59:57 -05:00
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
a94a923240
storm-1723: fix character display when a lot of different characters are used
2011-12-15 15:19:50 -05:00
9fa68f0da3
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-14 17:55:36 -06:00
2dc7df91ad
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-13 15:23:55 -06:00
e907a2fba4
merge
2011-12-12 10:45:56 -05:00
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
f9f247c5a6
SH-2084 Don't error out on framebuffer mismatch -- probably causing a crash when some post-snapshot or minimize/restore operation gets out of phase.
2011-12-07 16:36:26 -06:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
ff32ef773b
fix for crash on startup (font system not initialized when first creating fonts)
2011-11-29 23:53:28 -08:00
45d3e147ac
SH-1912 Add environment map back into shiny when lighting and shadows enabled.
2011-11-29 17:13:11 -06:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
06a2d4eb27
SH-2038 PROGRESS -- Hacked the code to not render alpha using VBO's on OS X since everything renders faster using VBO's except alpha for some mysterious reason.
2011-11-28 17:13:42 -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
b2824aa21d
SH-2690 Add comments per Vir's review feedback
2011-11-16 15:25:09 -06:00
986dccbeaf
SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting flexi attachments.
2011-11-16 15:08:17 -06:00
38853ffdda
merge
2011-11-16 12:41:15 -06:00
dbef1616dc
SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious Ringtail avatar)
2011-11-16 12:40:51 -06:00
6343c769ce
SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported
2011-11-16 10:00:41 -08:00
bbac7e9aec
SH-2681 Fix for shader compiler error on GLSL 1.30 and later
2011-11-15 13:01:23 -06:00
73d70b5d45
SH-2240 Make alpha mask cutoff a little less aggressive (err on the side of not creating an alpha mask)
2011-11-15 12:19:05 -06:00
df546bfba9
SH-2666 Tweak depth of field optimizations based on resident feedback.
2011-11-10 16:12:50 -06:00
c8f558f677
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
2011-11-10 11:39:08 -06:00
367d6212ae
SH-2652 Better DoF combine foo
2011-11-04 17:07:40 -05:00
e82c0561fa
SH-2652 Faster depth of field
2011-11-04 16:14:43 -05:00
fa5a0a90f4
SH-2240 Fix for core profile assertions when Debug GL enabled.
2011-11-03 15:00:40 -05:00
2179e1c1f2
SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway.
2011-11-02 13:13:38 -05:00
b58229a64e
SH-1427 Fix for sunlight color getting clobbered for non-deferred atmospheric shaders.
2011-11-01 14:33:20 -05:00
969aa248a4
SH-2633 Fix for avatar hair turning white when editing appearance
2011-10-28 16:26:20 -05:00
da1898d1cb
SH-2625 Fix for window size reverting to non-maximized whenever shaders are loaded.
2011-10-26 11:19:04 -05:00
7dafa1be79
SH-2622 Put back "Basic Shaders" toggle ability.
2011-10-25 15:07:57 -05:00
973e99622e
SH-2240 Make OSX never attempt to use GLSL 1.30 or later
2011-10-21 11:05:49 -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
6c157557dc
SH-2510 Potential fix for crash on startup on systems that don't have GL_ARB_shader_objects
2011-10-12 10:51:10 -05:00
2322c57b4d
SH-2545 Fix for transparent water option doing nothing when shaders are enabled.
2011-10-11 14:55:33 -05:00
3211c6e308
SH-2240 WIP on removing lots of string comparisons that were added to deal with exploding amounts of non-built-in GL state
2011-10-11 00:26:03 -05:00
055a881084
SH-2031 fix for mac/linux build
2011-10-07 12:48:26 -05:00
79912f9d3f
SH-2031 Profile guided optimization of matrix ops
...
- don't use F64 except where needed (should really factor out calls to gluProject)
- get rid of sorting by texture in favor of sorting by matrix (no sort needed, geometry is already matrix sorted as a result of frustum cull tree traversal order)
- unroll matrix sync inner loop and cache MVP and normal matrices
2011-10-07 03:12:11 -05:00
40fe25632c
SH-2553 Fix for glitches when rendering HUD attachments.
2011-10-06 15:00:14 -05:00
eb809e373d
SH-2481 Potential fix for viewer detecting incorrect amount of vram available when using certain video cards.
2011-10-05 01:03:42 -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
f558d86578
SH-2244 Don't use multisample texture (ever), and don't use GL_DEPTH_COMPONENT32 (use GL_DEPTH_COMPONENT24)
2011-09-30 01:11:26 -05:00
Xiaohong Bao