summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2023-08-23Merge branch main (DRTVWR-582) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-07-17Merge branch 'main' (DRTVWR-580) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp
2023-07-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp
2023-04-03SL-18330: Remove some set-but-unused vars flagged by Xcode 14.3.Nat Goodspeed
2023-03-31SL-19379 WIP add worn suffix, use bold font style for worn items and italic ↵Maxim Nikolenko
for links
2023-03-30Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-30Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
2023-03-24SL-17045 LSL editor cursor position desynchronizationAlexander Gavriliuk
2023-03-21SL-19266 Potential Use-After-Free in LLImageGL::setImageAlexander Gavriliuk
2023-02-07SL-19134 Some texture related adjustmentsAndrey Kleshchev
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-07-06SL-17732 std_bad_alloc at setManualImageAndrey Kleshchev
2022-06-29Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-06-15SL-17584 Frame buffer object is now nessesary to run viewerAndrey Kleshchev
2022-06-15SL-17584 Make setShaders crashes more informativeAndrey Kleshchev
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-27DRTVWR-543 post-merge cleanupAndrey Lihatskiy
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-05-26SL-17473 Viewer not clearing all Vertex Buffers in some casesAndrey Kleshchev
Image thread doesn't need mBuffer and buffer isn't thread safe so no point allocating it in an image thread.
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-29SL-17124 switchContext and loadShaderFile crashesAndrey Kleshchev
- 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-18Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-18llrender does not need a dependency on sdl. There was some comment out code ↵Nicky
which suggests it was needed long ago.
2022-04-18Use correct typeNicky
2022-04-17Switch to target_include_directoriesNicky
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-15SL-17035 Reverted a part of previous commitAndrey Kleshchev
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-14SL-17035 Crash at gl_debug_callbackAndrey Kleshchev
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-13Rework cmake, the original plan was to maybe be able to use conan targets ↵Nicky
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-06Create and use sdl::sdl targetNicky
2022-04-06Move CMake files to modernized cmake syntax, step 1.Nicky
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects.
2022-03-04SL-16928 Fix for broken bumpmaps on Intel GPUsDave Parks
2022-02-23Fix for mac buildDave Parks
2022-02-23Fix for some GPUs thinking they have 0 available vram.Dave Parks
2022-02-23Fix for media textures failing to update (and eating lots of memory) on ↵Dave Parks
Mac/Intel
2022-02-23SL-16815 and SL-16906 Avoid redundant bumpmap generation, add some ↵Dave Parks
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-22SL-16815 Cleanup -- disable multithreaded bumpmap generation while tracking ↵Dave Parks
down loading issues, fix sync issue in single threaded mode in media textures, restore LL_IMAGEGL_THREAD_CHECK functionality
2022-02-22SL-16815 Fix for broken media texture updates when multithreaded GL is disabled.Dave Parks
2022-02-17SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and ↵Dave Parks
querying for available video memory.
2022-02-14SL-16418 Media texture update stall fix. Make media texture updates use ↵Dave Parks
LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-03SL-16727: Revert change causing llvieweroctree to not render reflections ↵Ptolemy
when shadows are set to projectors cause by commit bb379cb8cc
2022-02-01Revert "Merged in euclid-16418 (pull request #846)"Dave Houlton
This reverts commit 40fe5277e1390c975d9a3184ff8fc46d69dfb450, reversing changes made to af830e5fc5840194be95140f644a27011b9b7e06.
2022-01-27SL-16418 rename media tex image per-update to avoid contention stallDave Houlton
2022-01-19SL-16653 Fix for some textures having incorrect texel colors after the first ↵Runitai Linden
row (and add more paranoia checks on texture data).
2022-01-14SL-16606: Add profiler category VERTEXPtolemy
2022-01-14SL-16606: Add profiler category UIPtolemy
2022-01-14SL-16606: Add profiler category TEXTUREPtolemy
2022-01-14SL-16606: Add profiler category SHADERPtolemy
2022-01-14SL-16606: Add profiler category PIPELINEPtolemy
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 02:24:19 +0000