summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2020-05-05Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-04-29SL-13121 fixed typo errorMnikolenko Productengine
2020-04-27Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-04-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-04-07SL-10449: Put first shader error on new line for readabilityPtolemy
2020-04-07SL-10449: Add dumping of shader to log filePtolemy
2020-04-07SL-10449 Cleanup dumping shader without LOG spam on every line when it fails ↵Ptolemy
to compile/link
2020-04-07SL-10449 Fix off-by-one line numbers when dumping shader that failed to ↵Ptolemy
compile/link
2020-04-03SL-12775 Run at high performance AMD gpuAndrey Kleshchev
2020-03-26DRTVWR-440, make enabling GLdebug flag slightly less infinite-loopyDave Houlton
2020-03-24Fix for bad fullbright shiny shininess values and inconsistency between ↵Runitai Linden
materialF and fullbrightShinyF
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-11-27Downstream merge from lindenlab/viewer-lynxAndreyL ProductEngine
2019-11-22Cleanup inconsistent typesMichael Pohoreski (Ptolemy Linden)
2019-11-20Merged lindenlab/viewer-eep into defaultMichael Pohoreski
2019-11-15QoL fix: remove extra blank lines for every source line when dumping shader ↵Michael Pohoreski (Ptolemy Linden)
source
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-12Fix instance existance checkandreykproductengine
2019-10-16SL-12103 More reliable memory detectionandreykproductengine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-30Fix names on sentinels to get doxygen to shaddap.Graham Linden
2019-08-13SL-11718 Crash in LLRender2Dandreykproductengine
2019-08-12Fix line-endings on new inline file.Graham Linden
2019-08-12DRTVWR-493: Streamline LLParamSingleton, LLLockedSingleton.Nat Goodspeed
Simplify LLSingleton::SingletonLifetimeManager to SingletonInitializer: that struct has not been responsible for deletion ever since LLSingletonBase acquired dependency-ordered deleteAll(). Move SingletonData::mInitState changes from SingletonLifetimeManager to constructSingleton() method. Similarly, constructSingleton() now sets SingletonData::mInstance instead of making its caller store the pointer. Add variadic arguments to LLSingleton::constructSingleton() so we can reuse it for LLParamSingleton. Add finishInitializing() method to encapsulate logic reused for getInstance()'s INITIALIZING and DELETED cases. Make LLParamSingleton a subclass of LLSingleton, just as LLLockedSingleton is a subclass of LLParamSingleton. Make LLParamSingleton a friend of LLSingleton, so it can access private members of LLSingleton without also granting access to any DERIVED_CLASS subclass. This eliminates the need for protected getInitState(). LLParamSingleton::initParamSingleton() reuses LLSingleton::constructSingleton() and finishInitializing(). Its getInstance() method completely replaces LLSingleton::getInstance(): in most EInitStates, LLParamSingleton::getInstance() is an error. Use a std::mutex to serialize calls to LLParamSingleton::initParamSingleton() and getInstance(). While LLSingleton::getInstance() relies on the "initialized exactly once" guarantee for block-scope static declarations, LLParamSingleton cannot rely on the same mechanism. LLLockedSingleton is now a very succinct subclass of LLParamSingleton -- they have very similar functionality. Giving the LLSINGLETON() macro variadic arguments eliminates the need for a separate LLPARAMSINGLETON() macro, while continuing to support existing usage.
2019-08-11DRTVWR-493 tiny optimizationandreykproductengine
2019-08-10DRTVWR-493 LLRender2D init cleanupandreykproductengine
2019-08-05SL-10566 Use vector for some high-traffic, low-item count containers instead ↵Graham Linden
of list. Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-07-29SL-11661 Backed out part of changeset 3a84abad1d46 to fix uploader crashandreykproductengine
2019-07-25DRTVWR-493 LLRender2D to LLParamSingletonandreykproductengine
2019-07-23SL-11621Graham Linden
Remove all references to unused shader var global_gamma. Remove many unused decls for gamma from shaders. Make post-deferred gamma correction use display_gamma. Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
2019-07-22Remove binding and use of glIsShader for now (only useful for avoiding ↵Graham Linden
warnings about deleting shader objects re-used across programs).
2019-07-22SL-10761Graham Linden
Make vograss objects set their face vert/index counts to 0 when setting the number of blades to 0 to disable rendering so we don't allocate space and then skip setting it up with actual index data in getGeometry.
2019-07-16SL-11605Graham Linden
Fix broken throttling of sky/envmap updates.
2019-07-16Add more asserts to try to catch 10761 before the driver kabooms.Graham Linden
2019-07-15SL-10761Graham Linden
Add code to force a usage hint when VBOs are disabled and make useBVOs reflect that as well.
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-06-28SL-11514Graham Linden
Convince Geenzo code to get a little DeMorgan in it. Trophy Unlocked: make all alpha textures partcipate in picking.
2019-06-03SL-10966Graham Linden
Fix light atten and transmittance calcs breaking ambient color contrib to fog. Needs to be tested on DRTSIM-415 or better to get legacy viewer settings that match EEP.
2019-05-21SL-11238Graham Linden
Fix ambient light inputs to the renderer. Fix 3rd sky shader w/ mistaken density mod conversion. Make ambient clamp apply to all modes. Tune ALM ambient clamp to match non-ALM.
2019-05-09SL-11056Graham Linden
Make OpenGL 3.3 cards not false alarm on version 140 shader reqs. Makes deferred rendering work on low-end GPUs more often.
2019-05-07SL-11055, SL-10966, SL-11087Graham Linden
Make haze look more like WL. Make lack of sun and moon mean black and fixed dir to prevent spooky underlighting.
2019-05-02Roll back sRGB decode changes from contrib for now.Graham Linden
Fix direct light matching across alpha/blended-material/deferred. Get diffuse lighting to match from Low to Ultra.
2019-04-10Separate out vertex program objects from fragment program objects and use it.Geenz
Given that mShaderObjects only ever expects one copy of a given shader object (leading to lots of "shaderV" and "shaderF"), it made having utility shaders a bit more difficult to incorporate. This change makes sure the two are separated. Using this over a multimap largely for readibility. Also, actually, you know, use this functionality. --HG-- branch : OPEN-340
2019-04-09First stab at moving atmospheric var calcs to its own utility shader.Geenz
Still some work to go here. Largely related to how certain values (i.e., SSAO mix values) are supplied. But so far, so good. --HG-- branch : OPEN-340
2019-04-02Fix missing EOL on last line.Graham Linden
2019-04-02Merge 6.1.2 LoveMeRender new hotnessGraham Linden
2019-04-01Whoops! Always make sure that our primary format is assigned.Geenz
2019-04-01Make LLImageGL's loading of assets as sRGB or linear conditional based upon ↵Geenz
sRGB decode support.
2019-03-30Hide sRGB decode behind a flag, and make sure that sRGB decodes is strictly ↵Geenz
opt-in.