6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
c1a4be7dae
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
0dc325c1e9
void LLTexLayerSet::asLLSD was never used, remove it completely.
...
(cherry picked from commit 7f0259f0e767969d260514e9ea810cbde7f1d24c)
2022-04-14 14:31:57 -04:00
46824ae0e8
Semicolon at end of for loop was making sure nothing ever got done.
...
The whole methode is questionable in doing nothing and it seems there was a deliberate change
that made sure it does nothing. I am not sure what this method really is supposed to do, thus I did opt
for the most basic version of "do nothing" like it was before.
(cherry picked from commit 1c1a93e42e209e959f09ec46ca414a8936f4ac20)
2022-04-14 14:31:57 -04: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
5fcea00c4f
SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()
2021-11-30 17:04:35 -07:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07: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
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
168d177197
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09 14:39:51 -08:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
d26567915c
Merge with Master after Viewer release
2021-02-03 09:31:32 -08:00
a0be0371d7
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 01:12:13 +01:00
5e7a0a963e
SL-14190 moved sAvatarDictionary
2020-11-03 22:12:39 +02:00
99d2ae5e02
SL-14190 sAvatarDictionary was not used
2020-10-26 18:47:12 +02:00
5ac650e459
FIRE-30020 - Support 1024 bakes in opensim
2020-10-12 23:39:37 +01:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16 21:12:53 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-16 18:53:24 -07:00
25b4257bf2
Improve the broken Intel fix. Make sure it still works when the current render target is bigger than the requested texture size. Assert Graham's other assumption that had been silently made about the sizes and offsets.
2019-08-13 14:58:43 +02:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
41ede77744
SL-10625
2019-07-24 12:52:24 -07:00
1529c16201
SL-11610
...
Revert attempted fix for 10625.
2019-07-24 10:53:04 -07:00
8d8e1831f1
Merge viewer-eep
2019-07-20 17:58:11 +02:00
c7eddc5fd9
Remove Nicky's Intel fix in favor of upcoming changes from LL
2019-07-20 14:08:54 +02:00
f6eab05017
Fix OSX compiler error from missing defaulted param and changed signature of renderAlphaMaskTextures.
2019-07-15 16:02:10 -07:00
946da4e507
SL-10761
...
Add work-around for broken intel drivers which can't use glReadPixels from RGBA FBOs to get alpha without locking up.
2019-07-15 15:04:48 -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
02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
b8f64c55b7
SL-11545
...
Fix glow calcs in sky shaders (not just the not shared enough atmospherics funcs).
Revert 10625 attempted fix as it breaks baggy clothes as much as skipping readbacks does.
2019-07-12 09:34:38 -07:00
6a7f12ebcf
SL-10625
...
Keep texture baking from pointlessly mercy flushing GL like a kid that just discovered the toilet handle.
Make glReadPixels call use GL_ALPHA8 (a texture format) instead of GL_ALPHA (an enum to indicate the alpha channel).
2019-07-11 13:34:32 -07:00
76c41dafe9
Roll back 10625 change and continue to side-step intel readback bug.
2019-07-08 11:18:54 -07:00
26bf61811b
SL-10625
...
Appease Clang.
2019-07-08 11:06:42 -07:00
1d86dcd846
SL-10625 another shot across the bow
...
Move dynamic texture update (which does local back readback work) to just before swap
which may keep the Intel driver from tripping on its own shoelaces and is also subjectively faster for bakes.
2019-07-08 10:10:22 -07:00
63af01fd72
BUG-225655/FIRE-24049; Intel driver >= 24 64 bit get a hack of toggling the FBO once before glReadPixels. Make this as specific tailore as possible for only those systems, as it is not a nice hack.
2019-07-06 19:11:06 +02:00
48f169423b
SL-11545, SL-11543, SL-10625
...
Fix emissives without normal maps clobbering the alpha output in materialF.
Modify glow size calc to get close to pre-EEP sun glow behavior (may require sky vert settings >= mid).
Make bake ignore alpha readback for Intel until we can determine why their drivers now go boom.
2019-07-03 10:04:05 -07:00
576f1cdd7e
SL-11521, SL-10625
...
Try aligning data used for glReadPixels to see if we can coax the Intel driver stack into being a less souciant pile of detritus.
Replace face color based test replaced with other logic in error.
2019-07-01 17:23:59 -07:00
c5b161957b
BUG-225655/FIRE-24049; Disable glReadPixels for Intel cards and 64 bit
2019-06-30 15:03:41 +02:00
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
06bce2ddd0
Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
...
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
f299e9f621
Fix reading the wrong channel introduced in ece96388feb1
2017-04-27 11:07:33 +02:00
148f0f1d24
Fix GL error GL_INVALID_ENUM in ReadPixels
2017-04-27 09:17:08 +02:00
556f09dfc4
Fixed bug in LLTexLayerSet::asLLSD() found by Henri Beauchamp (Cool VL Viewer)
2016-08-23 01:10:08 +02:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
487ca1bad3
v-r -> s-e merge WIP
2014-05-14 17:50:59 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
Ansariel