41d24952ff
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
2023-03-31 17:17:21 +03:00
f9866a3543
Merge branch 'main' into DRTVWR-573-maint-R
...
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
2023-01-12 04:37:42 +02:00
553a98723b
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
2022-12-13 08:05:03 +02:00
45b26b2444
SL-18565 restoreGL should re-add bumpmaps
2022-11-21 20:22:47 +02:00
9c5043d8c6
Fix a thread safety issue in the GL image worker.
...
LLViewerTexture::mNeedsCreateTexture needs to be an attomic bool since
it is written both in the main thread and in the GL image worker thread.
We can now enable threaded bump maps creation as a result of this fix.
I have read the CLA Document and I hereby sign the CLA
2022-11-19 21:42:41 +01:00
6a6b10020e
SL-18565 Built-in bump maps and some environment textures fail to load
...
Due to udp texture fetching no longer being present
2022-11-03 23:51:05 +02:00
b66f2e7da7
SL-18202 WIP merging autotune contribution and updating UI
2022-09-21 21:19:17 +03:00
c1deab5ba7
SL-17417 Fix for incorrect reflection orientation on fullbright prims.
2022-05-18 15:55:24 -05:00
c7ddba7eb4
SL-17417 Fix for incorrect reflection orientation on some moving child prims.
2022-05-16 16:02:38 -05:00
9dc8fee0f5
SL-16928 Fix for broken bumpmaps on Intel GPUs
2022-03-04 17:05:05 -06:00
d9a68339d5
SL-16815 and SL-16906 Avoid redundant bumpmap generation, add some assertions around ref counting and (hack) fix crash on shutdown from dangling texture reference (reduced to 1 dangling texture from several hundred, can't find the remaining reference).
2022-02-23 16:51:33 -06:00
8ffe3b7b30
Fix for mac build
2022-02-23 16:04:31 -06:00
74641a1213
SL-16815 Cleanup -- disable multithreaded bumpmap generation while tracking down loading issues, fix sync issue in single threaded mode in media textures, restore LL_IMAGEGL_THREAD_CHECK functionality
2022-02-22 19:48:01 -06:00
1c5c45f273
SL-16815 Fix for broken media texture updates when multithreaded GL is disabled.
2022-02-22 14:58:50 -06:00
1461e4d437
SL-16815 Fix for crash when disabling ALM.
2022-02-18 15:52:24 -06:00
0d6aa3c0fe
SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and querying for available video memory.
2022-02-17 22:52:23 +00:00
cfd39c3663
SL-16606: Add profiler category DRAWPOOL
2022-01-14 11:50:19 -08:00
511de439a3
SL-16405 Remove “pass == <magic number>” anti-pattern from various drawpools.
2021-12-02 20:11:43 +00:00
7a5ef999d0
SL-16386 consolidate all VertexShader capability checks to a single LLPipeline::shadersLoaded()
2021-11-30 17:04:35 -07:00
4d6963bd81
SL-16386 purge write-only state member LLCubeMap::mTextureCoordStage
2021-11-30 17:04:35 -07:00
fab60f242e
SL-16386 purge no-op fxn LLTexUnit::setTextureAlphaBlend()
2021-11-30 17:04:35 -07:00
3d1901dd4c
SL-16386 purge no-op fxn LLTexUnit::setTextureColorBlend()
2021-11-30 17:04:35 -07: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
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00: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
3efd4c50a0
SL-16222 Don't use bindFast for legacy bump maps (weird loading path sometimes has stale texture state).
2021-10-22 16:56:20 -05:00
d2dce17803
SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2021-10-19 02:26:41 +00:00
4dedd706ae
SL-16189 Optimize bindBumpMap
2021-10-13 11:02:00 -05:00
a1e6cbe4a8
SL-16166 Apply LLRenderPass::pushBatch optimizations to LLDrawPoolBump::pushBatch
2021-10-13 10:35:39 -05:00
4c3050a395
SL-10664, SL-10666
...
Fix up culling issues from perf work and fix Depth of Field rendering to get depth values properly.
Baseline for performance work.
2019-03-03 10:42:19 -08:00
c1d2416826
EEP performance WIP
...
Mods to improve alpha obj render performance.
Removes hacky fix for HUD elements getting atmospherics.
Re-orders rendering of glow to remove ~10ms/frame of shader re-re-rebinding.
Fix up default classes and basic shader loading (remove unused shared modules).
2019-02-28 14:06:19 -08:00
7e9033821a
De-duplicate deferred gbuffer access for getPosition/getNorm.
...
De-duplicate ambient occlusion shader code and move to new aoUtil.glsl
Split shared shadow tap funcs into shadowUtil.glsl
2018-12-06 10:59:11 -08:00
1df7760d31
SL-9632 add uniform and code to supress atmospherics in all shaders that could be used by HUDs
...
Make sky and cloud shaders use common scaleSoftClip implementation in gammaF.glsl
2018-09-14 21:52:52 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
3f3bac5e91
MAINT-4446 FIXED R2 (Alpha masking does not work when ALM is enabled if the object has a legacy bump set.)
2015-06-03 20:00:53 +04:00
5d70ea8d4f
Backed out changeset: ebdaabeef422
2015-06-03 19:57:01 +04:00
ae65d99dd9
MAINT-4446 FIXED R2 (Alpha masking does not work when ALM is enabled if the object has a legacy bump set.)
2015-06-03 18:04:17 +04:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
a5a0a0b136
Merge downstream code
2014-04-21 12:48:50 -07:00
33dfc0a8a1
Pull in downstream -bear, viewer-release and become version 3.7.5
2014-03-26 10:04:53 -07:00
816e8578f9
Backed out changeset: d0dfe3cda5b1
2014-04-16 13:21:06 -05:00
6f33f9090b
MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory
2014-03-20 19:21:52 +02:00
fe73339840
fix for MAINT-2523: Bumpmaps don't load when Lighting & Shadows are enabled.
2014-02-18 17:19:24 -07:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
Mnikolenko Productengine