0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
b41a54e126
SL-16606: Add profiler category VERTEX
2022-01-14 11:50:21 -08:00
47e2173239
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2021-12-16 08:42:54 +01:00
72cd3ffde7
SL-16447 Fix for broken benchmark.
2021-12-06 17:02:41 -06:00
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
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
49d750cd01
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-24 18:50:31 +01:00
724193e5b0
SL-16239 Fix for slowdown on AMD GPUs (disable core profile and remove volatile members from LLVertexBuffer)
2021-11-23 20:46:27 +00:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
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
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
4e8cd9437b
SL-16193 Fix for mesh selection outline not rendering correctly (and broken physics shapes display).
2021-10-26 14:07:00 +00:00
74a2354353
SL-16166 Don't use setupVertexBuffer where setupVertexBufferFast is called for (thank you, Henri!)
2021-10-13 09:37:04 -05:00
52e1a45659
SL-16166 Optimization pass on LLRenderPass::pushBatch
2021-10-12 14:46:19 -05:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
78007d2592
SL-16088 Fix for stall from many calls to glGenBuffers.
2021-09-27 22:35:50 +00:00
a35544c701
SL-16027: Add Tracy OpenGL support
2021-09-21 16:10:52 -07:00
03955f96db
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-24 20:12:46 +02:00
f77a30f740
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# autobuild.xml
2020-07-21 11:30:48 +03:00
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
60b57dd764
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-17 09:21:01 +02:00
b4cd4a27bf
make fix for FIRE-29679 more general
...
this revokes previous changes in llface.cpp and moves them lower down
the stack so that the additional safety check appliesto call callers.
2020-06-08 12:24:48 +01:00
cff453ff51
Merge remote-tracking branch 'eep/master' into fs-eep-vs2017
2020-05-20 13:49:20 +02:00
0007ff2660
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-07 12:29:58 +02:00
ca6f092929
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
2020-05-06 16:06:26 -04:00
a11c406492
SL-13121 fixed typo error
2020-04-29 12:45:06 +03:00
846d78345c
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-01 15:00:34 +02:00
126b91f8ee
DRTVWR-440, make enabling GLdebug flag slightly less infinite-loopy
2020-03-26 10:24:25 -06:00
30fa249664
DRTVWR-476: Fix glVertexAttrib{IPointer,PointerARB}() OpenGL calls.
...
VS 2017 complains about the same thing that clang does: casting S32 to GLvoid*
can't possibly produce a valid pointer value because S32 can't fit a whole
64-bit pointer. To appease it, not only must we use reinterpret_cast, but we
must first cast S32 to intptr_t and then reinterpret_cast THAT.
2020-03-25 16:12:46 -04:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
749eae85ce
SL-11661 Backed out part of changeset 3a84abad1d46 to fix uploader crash
2019-07-29 15:44:15 +03:00
8d8e1831f1
Merge viewer-eep
2019-07-20 17:58:11 +02:00
00590defe4
SL-11605
...
Fix broken throttling of sky/envmap updates.
2019-07-16 10:40:01 -07:00
5bae46b357
Add more asserts to try to catch 10761 before the driver kabooms.
2019-07-16 08:22:34 -07:00
ddf703611d
SL-10761
...
Add code to force a usage hint when VBOs are disabled and make useBVOs reflect that as well.
2019-07-15 10:33:16 -07:00
1133160476
SL-11109
...
Make shadowAlphaMask shader ignore vertex alpha before discards iff we're a fullbright object.
Keep llappearance from stuffing dangling pointers into the alpha cache (crash iff you're using nSight debugging and disable readbacks).
2019-07-12 13:26:02 -07:00
b75b1eb789
Merge viewer-vs2017
2019-03-31 01:37:56 +01:00
cacc164e7a
DRTVWR-476: Fix glVertexAttrib{IPointer,PointerARB}() OpenGL calls.
...
VS 2017 complains about the same thing that clang does: casting S32 to GLvoid*
can't possibly produce a valid pointer value because S32 can't fit a whole
64-bit pointer. To appease it, not only must we use reinterpret_cast, but we
must first cast S32 to intptr_t and then reinterpret_cast THAT.
2018-10-25 11:17:21 -04:00
106d34da3a
Merge viewer-neko
2018-06-12 21:54:15 +02:00
30be0b0560
MAINT-8686 Mode detailed VBO crash logging
2018-06-04 19:37:30 +03:00
3f331bb24c
Merge Firestorm LGPL
2018-05-18 10:32:56 +02:00
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03:00
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
0f690ab4da
Add const
2018-01-30 17:07:27 +02:00
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
6e445e82e2
MAINT-8091 Removed deprecated and unused private memory pooling
2018-01-30 14:03:26 +00:00
a6cc739aa7
Merge
2018-01-29 21:00:02 +01:00
1dfdbe2d03
Merge Firestorm LGPL
2018-01-29 20:58:22 +01:00
7a69b2b353
Proposed fix for mesh physics view crashes on OpenSim with physic shapes exceeding 65536 vertices
2018-01-29 14:54:41 +01:00
Ansariel