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

254 Commits (212e6d8fc1f724fd2fc5ecf1e2711f65218e25dd)

Author SHA1 Message Date
Ansariel 212e6d8fc1 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-22 11:46:39 +01:00
Runitai Linden 1a440be5e1 SL-16653 Fix for some textures having incorrect texel colors after the first row (and add more paranoia checks on texture data). 2022-01-19 10:35:58 -06:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy 206a8bb30f SL-16606: Add profiler category PIPELINE 2022-01-14 11:50:20 -08:00
Ansariel 381f8936f0 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llrender.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexture.cpp
 2021-12-03 18:23:05 +01:00
Dave Parks e7830b39f0 SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey textures 2021-12-03 15:07:31 +00:00
Andrey Kleshchev 7929230c04 mac build fix 
remove unused variable
 2021-12-02 01:19:40 +02:00
Ansariel 028941652b Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llvertexbuffer.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/pipeline.cpp
 2021-12-01 22:29:25 +01:00
Dave Houlton 8b92652806 SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush() 2021-11-30 17:04:35 -07:00
Dave Houlton 5fcea00c4f SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType() 2021-11-30 17:04:35 -07:00
Dave Houlton 68e09edad0 SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction 2021-11-30 17:04:35 -07:00
Ansariel d881fa40d3 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-20 22:35:31 +01:00
Dave Parks 28f9fb06a9 SL-16289 Rigged mesh rendering overhaul 2021-11-20 18:49:19 +00:00
Ansariel 7427b46ea5 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	.gitignore
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llerror.cpp
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llprimitive/llmodel.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llskinningutil.cpp
#	indra/newview/llskinningutil.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llteleporthistory.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/llvovolume.cpp
 2021-11-12 15:21:52 +01:00
Dave Parks e774bffb28 SL-16202 Fix for textures appearing black or flashing white due to optimization bugs. 2021-10-21 21:19:48 +00:00
Runitai Linden e7227afe02 SL-16166 Apply optimizations from pushBatch to other render call sites. Optimize out a map lookup in rigged face rendering. 2021-10-14 13:02:40 -05:00
Runitai Linden a1e6cbe4a8 SL-16166 Apply LLRenderPass::pushBatch optimizations to LLDrawPoolBump::pushBatch 2021-10-13 10:35:39 -05:00
Runitai Linden 52e1a45659 SL-16166 Optimization pass on LLRenderPass::pushBatch 2021-10-12 14:46:19 -05:00
Dave Parks d00272e0cc SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default. 2021-10-11 16:03:40 +00:00
Dave Parks 675514bdb3 SL-16093 Don't force the console window to be open on developer builds because it causes frame stalls while logging. 2021-09-27 23:56:06 +00:00
Ansariel ddfb4a5d1b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-08 14:30:18 +02:00
Andrey Lihatskiy fef6c1f51e Merge branch 'master' into DRTVWR-516-maint 2021-06-07 20:54:41 +03:00
Ansariel 2057fa9716 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 18:10:48 +01:00
Ansariel 93f1998a47 Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-01-08 23:06:41 +01:00
Ptolemy a5aac89809 SL-14035: Don't use sRGB textures when not specified 2021-01-06 18:17:56 -08:00
Beq 4d9ef8e06b BUG-228586 and related. Colour space fixes to address specularity issues 
This is effectively just completing the reversion of the gamma changes made by LL then partially backed out. (from Rye)
 2020-12-28 11:58:55 +00:00
Ansariel caf7f6c1d2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:53:39 +01:00
Ansariel e4d6a76486 Add one more check 2020-10-18 15:19:32 +02:00
Ansariel 16c14ea4cb Don't exceed the supported line width 2020-10-18 02:21:58 +02:00
Ansariel ac94268e5e Fix OpenGL core profile issue with glLineWidth by Rye Mutt 2020-10-18 02:21:58 +02:00
Ansariel 7d107d3954 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-29 11:34:41 +02:00
Andrey Lihatskiy 83822fd199 Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/llvocache.cpp
 2020-09-28 22:39:06 +03:00
Ansariel 14fb8f66f8 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-24 16:34:12 +02:00
Andrey Kleshchev 177ad21ade SL-13729 Performance of LLUI and LLRender2D 2020-09-17 19:59:48 +03:00
Ansariel 760dd9615c Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer 2020-08-06 10:44:57 +02:00
Dave Houlton 92ee1be5cf SL-13521, clang-format LLRender::syncLightState() (whitespace) 2020-08-05 12:30:24 -06:00
Dave Houlton 8b314a646f SL-13521, stamp out some remaining hard-coded 8s 2020-08-05 12:05:23 -06:00
Dave Houlton 107a7fec34 SL-13521 add an avatar appearance light to deferred mode 2020-08-04 17:14:19 -06:00
Ansariel 3d37c73654 Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer 2020-06-17 12:10:58 +02:00
Dave Houlton 84d3065596 SL-13281, add missing srgb->linear conversion for specular 2020-06-11 23:33:14 +03:00
Ansariel fff65c73fd Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer 2020-04-23 19:05:35 +02:00
Ansariel 024c357eb1 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-04-23 18:55:47 +02:00
Andrey Kleshchev abe5cc5787 Fix for 'release' configuration 
llassert is not used in 'release' configuration and build fails due to unused tex_index
 2020-04-21 10:32:45 +03:00
Andrey Kleshchev 278853824d Fixed merge conflict and restored SL-1130 2020-04-20 21:56:21 +03:00
Andrey Lihatskiy 7a311fe30e Merge branch 'master' into DRTVWR-497 2020-04-20 21:21:12 +03:00
Ansariel 846d78345c Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer 2020-04-01 15:00:34 +02:00
Runitai Linden 3d22273726 Fix for bad fullbright shiny shininess values and inconsistency between materialF and fullbrightShinyF 2020-03-24 11:22:01 -05:00
Ansariel fcdb198a62 Merge viewer-cougar 2019-12-13 17:15:37 +01:00
andreykproductengine 74904f39e1 SL-1130 Prevent crash on mMatrix 2019-11-29 18:31:50 +02:00
Ansariel ccea567c08 Merge viewer-eep 2019-06-19 20:20:14 +02:00