Commit Graph

48 Commits (85e69b043b098dbe5a09f2eac6ff541123089f13)

Author SHA1 Message Date
Adam Moss 9ce481a5ac STORM-1819: Ternary/graded shadow support
Coalesced patchset.
2012-04-21 17:35:50 +01:00
Dave Parks 353907bac6 SH-2908 Fix for incompatibility issue with GLSL 1.30 2012-02-28 16:10:04 -06:00
Dave Parks 8f261582b8 SH-2908 Fix for crash when enabling Lighting and Shadows on some AMD GPUs 2012-02-22 14:30:24 -06:00
Dave Parks e1a71a97cd SH-2908 Potential fix for pink textures on some OpenGL 3.1 implementations. 2012-02-21 14:02:09 -06:00
Dave Parks 8d12038ef6 SH-2908 Potential fix for precision complaints from some AMD OpenGL 3.1 implementations. 2012-02-17 15:06:48 -06:00
Dave Parks 76a27f5100 SH-2964 Fix for shader compilation error on some older NVIDIA cards. 2012-02-13 13:55:51 -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
Dave Parks 38e0b7de96 SH-2729 Fix for horizontal line of glitching graphics when DoF enabled 2012-02-06 18:56:19 -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 9fa68f0da3 SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-14 17:55:36 -06:00
Dave Parks 2dc7df91ad SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-13 15:23:55 -06:00
Leslie Linden 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
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 bbac7e9aec SH-2681 Fix for shader compiler error on GLSL 1.30 and later 2011-11-15 13:01:23 -06:00
Dave Parks df546bfba9 SH-2666 Tweak depth of field optimizations based on resident feedback. 2011-11-10 16:12:50 -06:00
Dave Parks c8f558f677 SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter. 2011-11-10 11:39:08 -06:00
Dave Parks 367d6212ae SH-2652 Better DoF combine foo 2011-11-04 17:07:40 -05:00
Dave Parks 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
Dave Parks b58229a64e SH-1427 Fix for sunlight color getting clobbered for non-deferred atmospheric shaders. 2011-11-01 14:33:20 -05:00
Dave Parks 973e99622e SH-2240 Make OSX never attempt to use GLSL 1.30 or later 2011-10-21 11:05:49 -05:00
Dave Parks 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
Dave Parks 348a701812 SH-2507 Shave some unused/redundant varying state and make the max texture index debug setting rebuild shaders to use no flow control when set to 1 or lower 2011-09-28 00:41:10 -05:00
Dave Parks c70026499a merge 2011-09-24 13:52:19 -05:00
Dave Parks 552a02dcba SH-2244 Fix for shaders not building on GL < 2.1 2011-09-24 13:52:00 -05:00
Dave Parks 183fe0d14c SH-2244 Fix for shaders not compiling on pre-GL-3.0 ATI drivers 2011-09-24 03:09:32 -05:00
Dave Parks da84f55527 SH-2243 work in progress -- don't use deprecated shader state 2011-09-16 12:40:53 -05:00
Leslie Linden bf0d36bf88 Mac rendering now with 100% fewer crashes when enabling shadows. 2011-08-24 15:41:00 -07:00
Leslie Linden 764b7a1ec0 Mac build fixes. 2011-08-22 15:58:12 -07:00
Dave Parks 2dd8ce53e4 SH-2242 FXAA support instead of unreliable multisample textures (done here because it's a smaller change than integrating glVertexAttrib with FSAA pipe). Shader integration with LLDynamicTexture subclasses. 2011-08-11 14:19:58 -05:00
Dave Parks 8ec39da346 SH-2181 Fix for alpha flickering when basic shaders enabled (don't use glAlphaFunc when shaders are available).
Reviewed by Leslie
2011-07-29 17:46:16 -05:00
Dave Parks 5e20cee4b4 SH-1897 Don't use GLSL 1.20 unless the GL version is >= 2.1f 2011-06-27 10:34:21 -05:00
Dave Parks ad4b559f9f SH-1903 Fix for silly shader compiler error. 2011-06-24 15:30:48 -05:00
Dave Parks 253642ccff SH-1903 Don't use indexed texture rendering when GL version is < 3.1 (fixes bad performance on cards with old drivers) 2011-06-23 23:06:36 -05:00
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 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 4353eeb928 SH-469 GL_ARB_texture_multisample support 2011-05-24 15:29:33 -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
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 9d5a3d7a2d Better support for curious mixtures fullbright/shiny/water with rigged attachments, deferred rendering, and not. 2010-08-13 19:35:03 -05:00
Dave Parks 95ca4315e3 Fix for stupid shader loading mistake. 2010-04-23 00:38:10 -05:00
Dave Parks 5715a9269b Fix for broken shader loading behavior when Debug GL enabled. 2010-04-22 23:16:39 -05:00
Dave Parks 54dd30cc42 More rigged attachments work. 2010-04-15 00:04:17 -05:00
Dave Parks 47ffcdb93d Rigged attachments (almost works). 2010-04-06 16:24:08 -05:00
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
2009-02-03 17:56:26 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
Eric Tulla 939a506569 Merging in file-move-merge ( QAR-649 )
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."

Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-30 17:57:00 +00:00