1eeee12ecb
SL-18190 Don't allocate mips for irradiance maps because they're never generated. Disable OpenGL core profile on Intel by default.
2022-09-20 12:28:45 -05:00
7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
765a99d238
Merged in SL-17967 (pull request #1113 )
...
SL-17967 require 4.1 core profile
2022-09-09 18:47:16 +00:00
e0c226b04d
SL-18078, SL-18065 -- Experimentally allow uploading of lossless normal maps, fix for crash on shutdown.
2022-09-01 18:06:15 -05:00
3cf349c4fa
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into SL-17967
2022-09-01 13:38:59 -07:00
2082443220
SL-17967 - Git rid of ARB that is in core
2022-09-01 10:58:27 -07:00
c9f893b100
SL-18065 WIP -- Adjust max virtual size to keep debug floater readable. Make assert on shutdown less frequent (still not gone, likely race condition). Fix unrelated assertion in reflection probes.
2022-08-31 11:36:00 -05:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
14af7cabdb
SL-17997 Fix for crash on shutdown
2022-08-30 10:32:09 -05:00
963566821d
SL-17927 Keep people from shooting themselves in the foot by twiddling deprecated settings.
2022-08-08 14:55:15 -05:00
38208441db
Merge remote-tracking branch 'origin/master' into DRTVWR-559
2022-08-04 10:59:26 -07:00
59ab8e78f4
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
6fc22df480
SL-17727 FIXED Crash when specifying --graphicslevel option on mac
2022-07-08 19:03:51 +03:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
a65e039174
SL-17483: Merge branch 'DRTVWR-563' of viewer into sl-17483
2022-06-09 13:03:58 -04:00
50dca86f64
SL-17483: Recast LLImageDecodeThread as a facade for ThreadPool.
...
Remove all references to LLQueuedThread (but emulate a couple bits of its API
such as handle_t and getPending()).
Migrate ImageRequest into llimageworker.cpp. It has never been part of
LLImageDecodeThread's public API. Remove ImageRequest tests.
Remove all references to LLImageDecodeThread::pause(). The idea of pausing
another thread is bizarre to me, and LLThreadPool has no such operation. Nor
does it have an abortRequest().
2022-06-09 12:06:23 -04:00
0bf91fc141
SL-17483: Merge branch 'track-threadpools' into sl-17483.
...
This picks up ThreadPoolSizes override logic embedded in ThreadPool's
constructor, plus the new static ThreadPool::getConfiguredWidth() and
getWidth() methods.
2022-06-09 11:22:01 -04:00
276647789a
SL-17483: Simplify ThreadPool instantiations.
...
Now that LL::ThreadPool's constructor has subsumed the work of discovering a
runtime override width, LLAppViewer::initGeneralThread() can simply pass the
compile-time default width instead of redundantly checking ThreadPoolSizes.
Also the default ThreadPool capacity has been bumped up to what "General" and
"LLImageGL" were requesting, so they need not pass that explicitly or explain
in comments why they're doing it.
But until we start throwing work at the "General" ThreadPool, configure it
down to 1 thread in settings.xml.
2022-06-09 10:36:13 -04:00
2efd6727c1
SL-17546 Fix 'release' configuration build tests
2022-06-08 19:47:37 +03:00
039c6689c9
SL-17547 Fix for crash on shutdown cleaning up LLLFSThread
2022-06-07 17:27:29 -05:00
314d086814
SL-17546 Do not launch updater for a non-interactible instance
2022-06-07 22:21:07 +03:00
fc7b5549cb
SL-17484 Fix for unit tests. Deprecate non-threaded LLQueuedThread and make lllfsthread threaded.
2022-05-31 16:54:05 -05:00
dfa71e2bb5
SL-17490 Only update a subset of textures each frame and remove dead debug code.
2022-05-31 11:57:15 -05:00
dd2fe2687c
DRTVWR-544 post-merge fix (restored SL-14961)
2022-05-31 02:35:29 +03:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +03:00
8bfd7e16f8
post-merge build fix
2022-05-27 03:22:22 +03:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# 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-05-27 02:51:33 +03:00
c0aa1a1202
SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219
...
Update task branch from main project branch.
2022-05-18 14:08:24 -04:00
b2141e9446
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-559
2022-05-16 12:26:17 -05:00
5ac6f13965
Merge remote-tracking branch 'origin/master' into DRTVWR-559
2022-05-04 14:47:52 -07:00
f3add82a4c
Merge branch master (D550) into DRTVWR-546
...
# Conflicts:
# indra/newview/llappviewer.h
2022-05-04 20:10:29 +03:00
93260cfeff
SL-17283 LLReflectionMapManager prototype. Remove snapshot code related overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
2022-05-04 16:07:50 +00:00
7fff7eecb6
Merge branch 'master' into DRTVWR-543-maint
2022-05-04 18:51:05 +03:00
904b16a0a7
SL-17124 switchContext and loadShaderFile crashes
...
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
ffdc04f5d2
SL-17040 Crash due to LLWord not existing
...
LLWord should persist till the end due to wide usage.
2022-04-21 22:58:30 +03:00
cf7bc4406e
SL-17159 Crash initializing LLInstanceTrackerPrivate
2022-04-21 20:43:50 +03:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
e9921e77b0
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
2022-04-18 13:29:25 -07:00
026ad511ea
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
e5cd4da823
SL-17035 Crash at gl_debug_callback
...
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
2022-04-14 22:26:58 +03:00
d5f2537764
SL-16831 Fix unit test
2022-03-29 17:30:50 +03:00
d11df20601
SL-16831 Fix unit test
2022-03-25 17:08:34 +02:00
0e954a9afd
SL-16972 Per feedback from Ansariel, only bump up max heap size on 64-bit builds.
2022-03-09 12:48:52 -06:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
Dave Parks