7b2205d8f6
Merge branch 'main' into DRTVWR-580-maint-T
2023-03-30 00:39:12 +03:00
d1b414e48b
SL-17045 LSL editor cursor position desynchronization
2023-03-24 22:17:36 +01:00
275ad3fdab
SL-19266 Potential Use-After-Free in LLImageGL::setImage
2023-03-21 17:04:48 +01:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
9a8ab9592d
SL-17732 std_bad_alloc at setManualImage
2022-07-06 22:22:36 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
ed36165f29
SL-17584 Frame buffer object is now nessesary to run viewer
2022-06-15 18:03:11 +03:00
beae4564e3
SL-17584 Make setShaders crashes more informative
2022-06-15 16:00:21 +03:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +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
4cfa59d3f1
SL-17473 Viewer not clearing all Vertex Buffers in some cases
...
Image thread doesn't need mBuffer and buffer isn't thread safe so no point allocating it in an image thread.
2022-05-26 22:43:12 +03:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +02: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
ca839307f9
Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake
2022-04-18 19:57:34 +02:00
29ca856038
llrender does not need a dependency on sdl. There was some comment out code which
...
suggests it was needed long ago.
2022-04-18 16:50:17 +02:00
7038e3e358
Use correct type
2022-04-18 16:46:59 +02:00
e0cf0cdfd4
Switch to target_include_directories
...
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
c184c882c6
SL-17035 Reverted a part of previous commit
...
According to davep, the intent of Debug GL is to crash and in this it's doing it's job, but the rest of the fix that makes the state not persist is a good solution.
2022-04-15 00:13:36 +03: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
241919e7f7
Rework cmake, the original plan was to maybe be able to use conan targets with the same name (that's why 3ps had names like apr::apr),
...
but it's safer and saner to put the LL 3ps under the ll:: prefix.
This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13 19:21:55 +02:00
5f7c74fa2e
Create and use sdl::sdl target
2022-04-06 20:25:49 +02:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
9dc8fee0f5
SL-16928 Fix for broken bumpmaps on Intel GPUs
2022-03-04 17:05:05 -06:00
85e480616d
Fix for mac build
2022-02-23 19:59:46 -06:00
4f9fa5e817
Fix for some GPUs thinking they have 0 available vram.
2022-02-23 19:53:49 -06:00
fc0b238654
Fix for media textures failing to update (and eating lots of memory) on Mac/Intel
2022-02-23 17:55:44 -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
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
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
f47730b92c
SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-14 18:07:24 +00:00
c38812aa15
SL-16727: Revert change causing llvieweroctree to not render reflections when shadows are set to projectors cause by commit bb379cb8cc
2022-02-03 11:11:46 -08:00
fdc4a81b57
Revert "Merged in euclid-16418 (pull request #846 )"
...
This reverts commit 40fe5277e1af830e5fc5
2022-02-01 15:49:32 -07:00
8d0efb54db
SL-16418 rename media tex image per-update to avoid contention stall
2022-01-27 17:09:29 -07:00
1a440be5e1
SL-16653 Fix for some textures having incorrect texel colors after the first row (and add more paranoia checks on texture data).
2022-01-19 10:35:58 -06:00
b41a54e126
SL-16606: Add profiler category VERTEX
2022-01-14 11:50:21 -08:00
b70614bd87
SL-16606: Add profiler category UI
2022-01-14 11:50:21 -08:00
bf0643e28a
SL-16606: Add profiler category TEXTURE
2022-01-14 11:50:21 -08:00
97552d2e75
SL-16606: Add profiler category SHADER
2022-01-14 11:50:20 -08:00
206a8bb30f
SL-16606: Add profiler category PIPELINE
2022-01-14 11:50:20 -08:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
8a18b5e427
SL-16462 Fix for broken water clip plane during water reflection/refraction map render.
2021-12-07 16:32:38 -06:00
72cd3ffde7
SL-16447 Fix for broken benchmark.
2021-12-06 17:02:41 -06:00
c614674ee6
SL-16282 FIXED Friend thumbnails are flickering
2021-12-06 19:20:49 +02:00
5e5be92d79
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
2021-12-06 15:29:34 +00:00
e7830b39f0
SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey textures
2021-12-03 15:07:31 +00:00
7929230c04
mac build fix
...
remove unused variable
2021-12-02 01:19:40 +02:00
Andrey Lihatskiy