Commit Graph

167 Commits (962be69e7170a9f7e8a99b9da4eae22ea6cdb038)

Author SHA1 Message Date
Ansariel acb6fda901 Merge viewer-eep 2019-01-26 00:02:49 +01:00
Graham Linden 7e9033821a De-duplicate deferred gbuffer access for getPosition/getNorm.
De-duplicate ambient occlusion shader code and move to new aoUtil.glsl

Split shared shadow tap funcs into shadowUtil.glsl
2018-12-06 10:59:11 -08:00
Ansariel 1733550573 Merge viewer-eep 2018-09-22 00:42:04 +02:00
Graham Linden 1df7760d31 SL-9632 add uniform and code to supress atmospherics in all shaders that could be used by HUDs
Make sky and cloud shaders use common scaleSoftClip implementation in gammaF.glsl
2018-09-14 21:52:52 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
vyacheslavsproductengine 3f3bac5e91 MAINT-4446 FIXED R2 (Alpha masking does not work when ALM is enabled if the object has a legacy bump set.) 2015-06-03 20:00:53 +04:00
vyacheslavsproductengine 5d70ea8d4f Backed out changeset: ebdaabeef422 2015-06-03 19:57:01 +04:00
vyacheslavsproductengine ae65d99dd9 MAINT-4446 FIXED R2 (Alpha masking does not work when ALM is enabled if the object has a legacy bump set.) 2015-06-03 18:04:17 +04:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Nicky c9064c8709 Fix another potential file handle leak. 2015-04-20 14:53:04 +02:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
Nicky ecbc123b31 Do not leak filehandles... 2015-04-18 01:44:00 +02:00
Ansariel a1fd8230bf Merge LL V3.7.12 2015-01-12 17:56:50 +01:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
simon a5a0a0b136 Merge downstream code 2014-04-21 12:48:50 -07:00
simon 33dfc0a8a1 Pull in downstream -bear, viewer-release and become version 3.7.5 2014-03-26 10:04:53 -07:00
Dave Parks 816e8578f9 Backed out changeset: d0dfe3cda5b1 2014-04-16 13:21:06 -05:00
maksymsproductengine 6f33f9090b MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory 2014-03-20 19:21:52 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Xiaohong Bao fe73339840 fix for MAINT-2523: Bumpmaps don't load when Lighting & Shadows are enabled. 2014-02-18 17:19:24 -07:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -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
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Graham Linden 0a61606b79 NORSPEC-251 fix issues with binding unloaded standard bumpmaps 2013-06-14 14:39:18 -07: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
Graham Madarasz 7c72222823 NORSPEC-158 fix issues with loading of bumpmaps on clean install 2013-05-30 17:43:14 -07: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 ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz (Graham Linden) 7c242dae73 Fix Mac startup crash on unbind cube map if RenderDebugGL is on 2013-04-01 13:27:25 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz (Graham) 4e81a84abd Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively. 2013-03-04 08:57:58 -08:00
Graham Madarasz (Graham) df08808640 Improve perf of GLSL uniform lookups by name 2013-02-28 09:33:41 -08:00
Graham Madarasz (Graham Linden) 34158130b4 Help the hg stop worrying about comment-only diffs 2013-02-21 16:54:36 -08:00
Graham Madarasz (Graham Linden) 2fd0e6e8f9 Merge viewer-cat and resolve conflict with alternate self 2013-02-21 16:50:04 -08:00
Graham Madarasz (Graham Linden) eb41cf7f76 For MAINT-755 Fix for unbinding cubemap causing false alarm in tex type checking code (OS X RenderDebugGL crash) Code review: Dav3p 2013-02-21 16:26:16 -08:00
Graham Madarasz (Graham Linden) e2f3ea50d5 For MAINT-1291 Re-order cubemap disable and shader tex disable to avoid false alarm when using RenderDebugGL. Code Review: DaveP 2013-02-14 10:57:28 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Richard Linden 93578f7e51 Automated merge with http://bitbucket.org/lindenlab/viewer-cat 2012-08-24 16:31:29 -07:00
Richard Linden a98c7e150b llfasttimer cleanup
removed unnecessary cache miss from fast timers
renamed llfasttimer_class back to llfasttimer
2012-08-06 16:08:04 -07:00