livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,385 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

27385 Commits (b2344cfd13bc0dc7175cf3895b7111186dc573c9)

Author SHA1 Message Date
Graham Madarasz b2344cfd13 Fix rendering artifacts on Mac Mobile GeForce cards 2013-04-20 03:36:21 -07:00
Graham Madarasz abb72591d4 Fixed line endings on shader 2013-04-19 19:29:06 -07:00
Graham Madarasz 894412285b Fix forward decl to match changed func def and clear defines between shader compiles for ifdef sanity 2013-04-19 18:00:13 -07:00
Graham Madarasz e10cac8847 Avoid mac shader compiler crash on someFuncTakingFloats(INTEGER_CONSTANT) malarkey 2013-04-19 14:26:49 -07:00
Graham Madarasz 4cd213b005 Merge 2013-04-19 14:04:13 -07:00
Graham Madarasz 214031a817 Change permutation setup to match use of ifdefs (as opposed to ifs) 2013-04-19 14:03:27 -07:00
Graham Madarasz (Graham Linden) 8137a3c26f Change #ifs to #ifdefs for mac compiler 2013-04-19 13:52:10 -07:00
Graham Madarasz 7c0bea5bb4 Rework ifdefing and fix windows shader compiler warnings from materialF 2013-04-19 13:08:57 -07:00
Graham Madarasz (Graham Linden) c5410a5d22 Shader changes for Mac compat 2013-04-19 11:53:58 -07:00
Graham Madarasz 2b3495ae5e Cleanup mac hack and add defs to deferred alpha shader so compiler won't complain about #if with undefined vars 2013-04-19 10:52:03 -07:00
Graham Madarasz 6adc6d71a7 Merge viewer-dev-materials 2013-04-19 07:48:05 -07: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
Graham Madarasz (Graham Linden) 8bccedd163 NORSPEC-59 NORSPEC-98 NORSPEC-125 avoid rendering mesh LODs which crash driver on mac 9400/9600 GT only 2013-04-18 09:43:26 -07:00
Graham Madarasz 3200f07ae2 NORSPEC-125 Materials V shader cleansing 2013-04-18 08:20:26 -07:00
Graham Madarasz afe8d2246e NORSPEC-125 More alpha vert shader cleansing for decrepit nV compiler 2013-04-18 07:30:12 -07:00
Graham Madarasz f76b3d7e7d NORSPEC-125 fiddle with ifdefs in alpha shaders again in hopes of linking on mobile geforce macs 2013-04-18 05:30:44 -07:00
graham linden 1c3c737a83 Merged lindenlab/viewer-development-materials into default 2013-04-18 05:04:35 -07: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
Graham Madarasz 8ed49bb828 Simplify ifdefs in alpha shaders for Mac 2013-04-17 16:50:03 -07: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
Graham Madarasz 83f3fd0dd6 NORSPEC-59 new shader changes -> new decrepit shader compiler workarounds 2013-04-17 14:27:50 -07: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