Commit Graph

52 Commits (d65de99052d5ff08c7c4290a1f1b8e396105b8af)

Author SHA1 Message Date
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Dave Parks 1c2410b8af SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code. 2023-02-03 19:45:31 -06:00
Dave Parks 6f136d403b SL-19000 Fix various 3D UI components not respecting depth buffer. Incidental decruft. Do I get a prize for 1000th jira? 2023-02-01 17:09:34 -06:00
Brad Kittenbrink 0d58d3ee7a Merge remote-tracking branch 'origin/DRTVWR-559' into DRTVWR-559 2022-11-30 09:29:48 -08:00
Andrey Kleshchev 9f7967fcdc SL-18727 Save material to Inventoryshould prioritize picked face 2022-11-29 23:36:37 +02:00
Brad Kittenbrink a887c486b4 Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559 2022-11-28 16:24:53 -08:00
Andrey Kleshchev 20dc30450c SL-17999 PBR material in tool's texture tab 2022-09-01 13:26:10 +03:00
Dave Houlton 02c71b0ac2 Merge branch 'master' v 6.6.1 into DRTVWR-528 2022-05-26 11:18:44 -06:00
Dave Houlton 68e09edad0 SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction 2021-11-30 17:04:35 -07:00
Dave Houlton 3e99853b29 SL-16138 remove checks for now-mandatory capabilities 2021-10-06 10:59:00 -06:00
Ptolemy eb1e2a2314 SL-14113 Cleanup indentation 2021-04-29 14:07:57 -07:00
Ptolemy 1ef70ff1d3 SL-14113 Cleanup face magic number 2021-04-29 14:07:57 -07:00
Ptolemy ced2bd5ed4 SL-14113 Fix moon haze 2021-04-29 14:07:57 -07:00
Ptolemy 0e3e720a8d SL-12261 Remove redrawing of sky twice and timer causing it not to be re-drawn twice 2% of the time 2020-07-09 20:12:12 -07:00
Andrey Lihatskiy 7a311fe30e Merge branch 'master' into DRTVWR-497 2020-04-20 21:21:12 +03:00
andreykproductengine 4f5d785226 SL-12014 Animesh is now a separate rendering type 2019-10-25 17:32:19 +03:00
Graham Linden 41c7523e08 SL-11676
Make sun/moon textures render on Low/Low-Mid again.

Fix solar additive being present when moon was only heavenly body in sky.
2019-08-12 13:44:59 -07:00
Graham Linden d23bf2c16e SL-11541 WIP
Make LLSettingsSky::gammaCorrect work like the soft scale clip and gamma correct from release.

Add transmittance effects to the low-end sky tex gen.
2019-07-10 13:02:09 -07: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
Graham Linden d292ec7ee0 Better OSX clean up. 2018-10-30 21:25:52 +01:00
Graham Linden 17df1215b0 Fix OSX issue with ctor not recognizing version with defaulted arg. 2018-10-30 21:12:22 +01:00
Graham Linden graham@lindenlab.com 3116416fcb Le Merge 2018-05-01 00:10:11 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Graham Madarasz (Graham) fbf3d8b781 NORSPEC-291 WIP materials underwater with haze, reflection broken, water dist broken 2013-07-11 16:21:23 -07:00
Graham Linden 326e20b0e5 NORSPEC-291 WIP materials underwater w and wo alpha, water fog color broken, no refl, no water dis 2013-07-10 09:47:46 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 54ba56dbe9 SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings 2011-09-26 18:31:55 -05:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Dave Parks 14f6bbadef SH-2242 Work in progress migrating to glVertexAttrib everywhere 2011-08-08 15:29:23 -05:00
Dave Parks 6469f1c2f2 SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available. 2011-07-17 00:24:08 -05:00
Dave Parks 8e8e846542 SH-1533 Fix for skybox going black under certain conditions. 2011-05-11 14:46:35 -05:00
Tofu Buzzard 179e9e37ec merge from viewer-development. 2010-10-27 11:03:39 +01:00
Tofu Linden 393c819477 VWR-21967 There's lots of ::renderForSelect() code that we don't need any more.
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
2010-10-10 15:25:11 +01:00
Merov Linden c7b6ebaf76 Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306) 2010-09-30 22:57:05 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden d74aff7869 CID-347
Checker: UNINIT_CTOR
Function: LLDrawPoolSky::LLDrawPoolSky()
File: /indra/newview/lldrawpoolsky.cpp
2010-01-29 13:13:37 -08:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +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
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Steven Bennetts 16baf6c9d4 merge release-QAR-499 Viewer 1.20 RC 3
merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28 23:29:46 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Josh Bell ea8fb7238e svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-31 01:41:19 +00:00