Commit Graph

27380 Commits (8bf4f1591114f135c64bee5cb9cb5e67bbcf8acd)

Author SHA1 Message Date
Dave Parks 8bf4f15911 NORSPEC-104 Fix for texture animation sometimes not overriding specular and normal map texture coordinates. 2013-04-25 17:15:47 -05:00
Dave Parks 4102d3fb06 NORSPEC-106 Fix for emissive mask overriding environment mask. 2013-04-25 16:03:19 -05:00
Dave Parks 3a2576cefa NORSPEC-118 Compatibility pass against advanced lighting disabled. 2013-04-25 13:29:40 -05:00
Dave Parks 454ae4cf61 NORSPEC-146 Fix for objects with alpha mode set to none or mask being shiny 2013-04-24 20:35:16 -05:00
Dave Parks d46c7039bc Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-24 12:41:14 -05:00
Graham Madarasz 4ae48c225b Correct fix to include affect on ambient term and make work on Mac nV 2013-04-24 10:37:29 -07:00
Graham Madarasz ce48b9d8cf Fix mismerge that lost Geenz colorspace conversion of diffuse in alphaV 2013-04-24 10:33:38 -07:00
Graham Madarasz 7931804321 NORSPEC-59 NORSPEC-125 make materials and alpha shaders work on Mac laptops with nV mobile graphics cards 2013-04-24 06:24:21 -07:00
Geenz fbbbb80752 Fix for overbrigtened alpha blended objects in deferred. Linearize diffuse surface color in the vertex shader before passing it to the fragment shader. 2013-04-24 05:16:02 -04:00
Dave Parks fcec034a38 Tweak to remove usage of GL_DEPTH_CLAMP for now until projectors can be made to work with it. 2013-04-23 17:03:57 -05:00
Dave Parks 95672cabb9 NORSPEC-142 Fix for unusable performance on GTX 285 2013-04-23 12:50:47 -05:00
Dave Parks 3d7c100062 NORSPEC-141 Back out a change that seems to cause shadow artifacts on rigged attachments. 2013-04-22 13:59:25 -05:00
Dave Parks 6881b01ea9 NORSPEC-139 Fix for non-fullscreen spotlight lighting mismatching fullscreen spotlight lighting 2013-04-19 17:20:52 -05:00
Dave Parks f9ff68b5e3 Cleanup specular highlights from spot lights 2013-04-19 02:56:15 -05:00
Geenz b145007941 Fix for alpha blended objects becoming too bright when gamma correction is applied. 2013-04-18 23:18:21 -04:00
Geenz 9e53724538 Merged with latest viewer-development-materials. 2013-04-18 23:11:38 -04:00
Geenz b6a6479c37 Mitigation for light attenuation looking different with gamma correction. Assume that light attenuation wants to be linearized before we apply gamma correction. 2013-04-18 21:31:10 -04:00
Geenz 14b807e55e Don't apply gamma correction underwater (for now). 2013-04-18 21:05:16 -04:00
Geenz 15bf1a81d1 This should take care of alpha blended full bright objects and gamma correction. 2013-04-18 20:42:31 -04:00
Dave Parks 509c35d5ba NORSPEC-90 Cleanup avatar alpha shaders 2013-04-18 19:21:08 -05:00
Geenz 6b836eacaf Use GL_SRGB8_ALPHA8 for the diffuse and specular buffers, and correct gamma *before* glow and other post processing effects that don't care about being gamma correct. 2013-04-18 19:43:30 -04:00
Dave Parks 28fcb3d549 NORSPEC-90 Remove unused state from alphaF/alphaV 2013-04-18 18:31:49 -05:00
Dave Parks 1a5bba865c NORSPEC-90 Cleanup of alpha pool hook ups for materials. 2013-04-18 18:00:56 -05:00
Dave Parks 37f984a942 Automated merge with https://bitbucket.org/Geenz/viewer-development-materials 2013-04-18 01:34:39 -05:00
Dave Parks 70d50028ae Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-18 01:33:54 -05:00
Dave Parks 0e3aa71a69 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-18 00:31:17 -05:00
Dave Parks fc965b3c89 NORSPEC-135 Fix for environment map not showing up if glossiness is zero. 2013-04-18 00:15:18 -05:00
Geenz 4afb70eba7 Merge with latest viewer-dev-materials. 2013-04-17 17:47:18 -04:00
Dave Parks 35ede26097 NORSPEC-128 Edit glossiness and environment as U8's from [0,255], as they are stored 2013-04-17 16:46:32 -05:00
Geenz 35cc62f24c Merge + propagated class 2 alphaF changes to class 1 alphaF. 2013-04-17 16:40:10 -04:00
Geenz bb5bf632c6 First pass of gamma correction reimplementation. 2013-04-17 15:53:09 -04:00
Graham Madarasz c7b9b9e02c NORSPEC-133 More NULL shader pointer crash suppression 2013-04-17 09:19:08 -07:00
Graham Madarasz e40bcc4e16 NORSPEC-59 and NORSPEC-133 work-around crash with RenderDebugGL on and fix breakage in shaders from Mac changes 2013-04-17 09:05:40 -07:00
Dave Parks 67af268b78 NORSPEC-90 Alpha pool hookups for materials. 2013-04-17 01:51:39 -05:00
Graham Madarasz 119c0a35f1 NORSPEC-59 fix? for mac crasher 2013-04-16 18:07:25 -07:00
Graham Madarasz 70dbb7a59c NORSPEC-127 work-around crasher by forcing simple faces into simple pass 2013-04-16 17:24:51 -07:00
Graham Madarasz (Graham Linden) d8d889802b Merge viewer-dev-materials 2013-04-16 13:43:10 -07:00
Graham Madarasz a9f3e6d95c See if we can run with no ifdefs in alpha shaders on all platforms 2013-04-16 12:50:45 -07:00
Oz Linden 4b2d6062ba merge rollback from graham 2013-04-16 14:52:18 -04:00
graham linden a054dff522 Merged lindenlab/viewer-development-materials into default 2013-04-16 08:28:38 -07:00
Graham Madarasz 0b4d76ce78 NORSPEC-123 et al...roll back NSPEC 91 fix to avoid knock-on and set correct default env intensity 2013-04-16 08:27:30 -07:00
Graham Madarasz c4413f493e NORSPEC-123 et al...roll back NSPEC 91 fix to avoid knock-on and set correct default env intensity 2013-04-16 08:27:30 -07:00
Oz Linden b7d4ba1f08 merge changes for alpha fixes from geenz 2013-04-16 09:00:39 -04:00
Dave Parks d1f713f30b Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-16 03:02:00 -05:00
Geenz c72c3691ec Merged Graham's stuff amongst others. 2013-04-15 19:40:12 -04:00
Dave Parks f964e51fc9 Fix for mac build 2013-04-15 15:31:57 -05:00
Dave Parks 7ed3d61ded Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-15 14:13:15 -05:00
Dave Parks 359b6cad5b NORSPEC-117 Fix distance attenuation to not use pow(lit, 0.7) function so distance falloff is still soft 2013-04-15 14:12:16 -05:00
Dave Parks 8025b8b2bc NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available 2013-04-15 13:16:14 -05:00
Geenz 39544a3b06 Hooked up normal and specular texture coordinates. 2013-04-15 02:29:03 -04:00