summaryrefslogtreecommitdiff
path: root/indra/llappearance/lltexlayer.cpp
AgeCommit message (Collapse)Author
2022-09-19SL-18128, SL-18128 - No glerror on Mac!Howard (Aech Linden) Stearns
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # 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-04-14void LLTexLayerSet::asLLSD was never used, remove it completely.Nicky
(cherry picked from commit 7f0259f0e767969d260514e9ea810cbde7f1d24c)
2022-04-14Semicolon at end of for loop was making sure nothing ever got done.Nicky
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)
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-30SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()Dave Houlton
2021-11-30SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunctionDave Houlton
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
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-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2020-11-03SL-14190 moved sAvatarDictionaryAndrey Kleshchev
2020-10-26SL-14190 sAvatarDictionary was not usedAndrey Kleshchev
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
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-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
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.
2019-07-24SL-10625Graham Linden
2019-07-24SL-11610Graham Linden
Revert attempted fix for 10625.
2019-07-15Fix OSX compiler error from missing defaulted param and changed signature of ↵Graham Linden
renderAlphaMaskTextures.
2019-07-15SL-10761Graham Linden
Add work-around for broken intel drivers which can't use glReadPixels from RGBA FBOs to get alpha without locking up.
2019-07-12SL-11109Graham Linden
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-12SL-11545Graham Linden
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-11SL-10625Graham Linden
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-08Roll back 10625 change and continue to side-step intel readback bug.Graham Linden
2019-07-08SL-10625Graham Linden
Appease Clang.
2019-07-08SL-10625 another shot across the bowGraham Linden
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-03SL-11545, SL-11543, SL-10625Graham Linden
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-01SL-11521, SL-10625Graham Linden
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.
2018-02-15Add debug setting and code to allow nVidia nSight graphics debugging to ↵Graham Linden graham@lindenlab.com
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).
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2014-02-14[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdownBaker Linden
- Added clear() after DeletePointer() call to hopfully fix this...
2013-10-21MergeXiaohong Bao
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-10MAINT-2968 Fix for crash on AMD hardware running current drivers.Dave Parks
2013-09-24SH-2728 SH-4010 FIX pants flare issuesNyx Linden
When wearing multiple layers of pants, the morph masks for all layers would be composited, resulting in the smallest intersection of all layers. Instead we should only be applying the top layer. This change will affect all consumers of the llappearance library.
2013-09-20SH-3943 FIX beard morph masks applied inconsistently on login to server bake ↵Nyx Linden
region Looks like we were caching bad morph masks that were generated on login. Adjusting algorithms to always replace the cache when we have invalidated the other channels of the baked texture.
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
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-06-05merge with viewer-releaseRichard Linden
2013-06-05Unwind cruft from hunting for 2707 they won't end up in vwr-dev-matGraham Madarasz
2013-06-01BUG-2707 turn off more LL_DEBUGS to narrow down Kat's crashing cuplritGraham Madarasz
2013-06-01BUG-2707 hunt for infos call crashing KatGraham Madarasz
2013-03-11#include fixprep
2013-03-11Viewer-chui mergeprep
2013-02-06SH-3651 FIX Beard edits not applying on server bakesNyx Linden
Despite incrementing the COF version, beard edits were not updating the head hash. We were not applying layers/parameters to the baked texture hashes for layers that did not contain a user-defined image. However, many layers have standard morph masks, etc that are affected by wearable parameters. Edited the LLTexLayerInterface::getWearable() method to return the proper wearable type if there is no associated local texture index, and all parameters in the wearable refer to a particular wearable type. Should be safe even if some (but not all) params have no wearable type defined.