Commit Graph

29 Commits (7dafa1be79f4e3f454ce022326cb09fa5cabb003)

Author SHA1 Message Date
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