Commit Graph

152 Commits (1d2ead44f6a759d0fbb7e83b49a67e5923cbddb6)

Author SHA1 Message Date
Ansariel 8ab2169efb Merge viewer-cougar 2018-08-22 10:15:24 +02:00
Graham Linden 3237923e10 MAINT-3699 new shaders supporting alpha blend/mask rigged content.
Make shader loading debug logging of uniforms use ShaderUniform to make supression simpler.
2018-08-16 00:31:39 +01:00
Ansariel 547df251e4 Merge viewer64 2017-10-02 17:57:56 +02:00
Ansariel bbb003a9fa Backed out changeset 740d3937e83c (Fix for FIRE-20305) to make room for LL fix 2017-10-02 17:52:36 +02:00
ruslantproductengine 0e9fb587fa MAINT-7813 - 3D rendering broken on Windows in build 508618. 3D rendering starts before 2D login screen is cleared.
FIXED
2017-09-18 21:02:53 +03:00
Oz Linden 6883c6b1f6 replace a 'continue' with an 'else' 2017-09-14 16:56:51 -04:00
ruslantproductengine 46dc097516 MAINT-7129 - [Project Alex Ivy][MAC] Materials and ALM shaders broken in Mac viewer
FIXED
2017-09-14 16:39:01 +03:00
Ansariel 11b7af0c2a FIRE-20305: Fix GLSL compatibility in shaders, by Drake Arconis (Alchemy Viewer) 2016-11-29 15:00:27 +01:00
Nicky b547aeef03 Merge with https://bitbucket.org/lindenlab/viewer-vlc 2016-08-01 16:15:47 +02:00
ruslantproductengine eebbda288d Backed out changeset: 5fe5ad059c05 2016-07-18 20:09:18 +03:00
Nicky e982c273fd Merge with viewer-release-vlc 2016-05-29 19:27:00 +02:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
ruslantproductengine 1b5af4be29 Add invert texture coordinates for media textures. 2016-05-13 18:47:23 +03:00
Ansariel 63c895fe62 Merge viewer-quickgraphics 2016-03-10 08:50:20 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 511bf30a2e make shader loading messages LL_DEBUGS 2016-03-07 15:40:39 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden b66c719060 merge changes for 3.7.20-release 2014-11-10 14:43:05 -05:00
Liny 1ee6b83b10 Proper fix for intel shder compiler log spam. 2015-02-26 09:58:34 -08:00
Liny 37d47ffbf0 Fix intel GLSL compiler spitting out "No errors." instead of an empty string like others do when there are no errors, causing log spam. 2015-02-25 23:54:22 -08:00
Ansariel 99cbf150a0 Merge LL V3.7.21 2015-01-15 13:55:17 +01:00
Ansariel 992ebe2c63 Remove Nicky's AMD fix - will be replaced by the V3 version 2015-01-15 13:16:21 +01:00
Tank_Master 93c0ece928 Merge LL v3.7.20 2015-01-15 01:17:02 -08:00
Oz Linden 7ffa456683 STORM-2080: correct fitted mesh rendering on some ATI cards 2014-10-14 11:22:39 -04:00
Dave Parks d0428575fb Automated merge with http://bitbucket.org/lindenlab/viewer-release 2014-06-19 13:14:42 -05:00
Dave Parks 24f8745914 MAINT-3131 Use benchmark to determine GPU class instead of GPU table. 2014-03-19 17:57:00 -05:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Nicky 72faa660f7 Remove old AMD/ATI fix for pink. It is for driver that predate 2009-12, with something as old as that, there will be a lot more issues than just pink textures. 2014-04-06 18:22:28 +02:00
Nicky c2fbeae724 FIRE-12968/FIRE-12929; Fix crash for AMD driver and random rendering artifacts. 2014-03-10 00:00:49 +01:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
Dave Parks ff8b002c3b Quite down log spam from loading shaders.
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz (Graham Linden) f86a7c04d3 NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues 2013-07-30 11:33:58 -07:00
Graham Madarasz (Graham Linden) b44e7303d8 NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac 2013-07-29 18:59:45 -07:00
Graham Linden f357269c38 NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place 2013-07-25 09:36:13 -07:00
Graham Linden e290dd3fa1 NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects) 2013-07-24 04:03:27 -07:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
Dave Parks 743d1a777e NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
Reviewed by Graham
2013-05-29 18:48:09 -05:00
Dave Parks 933d4c40f4 NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies. 2013-05-23 12:47:52 -05:00
simon b864cecd6c De-bork the viewer merge, causing black in-world images. Reviewed by Kelly 2013-05-13 16:34:52 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Graham Madarasz 1688e995eb Provide LLGLSLShader backwards compat so as not to break the appearance utility 2013-04-26 09:11:52 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00