summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2021-12-15DRTVWR-528 merge up to 6.5.2Dave Houlton
2021-11-12DRTVWR-528 Reverting multiple commits due to moving them into D546 branchAndrey Kleshchev
This reverts commits 9b5b2eac82b1f423daec463b3d55d0f3d3979bbc SL-15933 53c0144dd272470172591b967a84beaa4019b728 SL-11687 492ea7c3a03d5ef0d3679b873a44c08baaced0f1 SL-16056 b854eceee3a867d64b20de18d6b7ce91b33abed0 SL-15391 921c3f5f69c90b5924d2f4bbbd32455f8c9c8173 SL-13561 639acb6ff7495a6840d437dd8473172ec03e200a SL-15333
2021-07-19Merge branch 'master' v 6.4.22 into DRTVWR-528Dave Houlton
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-06-11SL-15391 Crash at getUniformLocationAndrey Kleshchev
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DV528-merge-6.4.20Dave Houlton
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-06-01SL-15333 Crash in glh_init_extensionsAndrey Kleshchev
2021-05-06SL-15221 strip debug code, add sanity asserts, formatDave Houlton
2021-05-06SL-15221 fixed off-by-one accounting errorDave Houlton
2021-05-06SL-15221 add VBO dirty bit to avoid many per-frame checksDave Houlton
2021-04-29SL-14113: Remove useless last digit in constant to help readability based on ↵Ptolemy
Euclid's feedback
2021-04-29SL-14113: Merge duplicate shader constant for clarity.Ptolemy
2021-04-29SL-14113: Remove magic numbers. Take advantage of existing shader #defines ↵Ptolemy
injection by extending shader loading to make use of addConstant() instead of hard-coding magic number constants in each GLSL file.
2021-04-01SL-14990 Turn on shader init logging after crashAndrey Kleshchev
2021-03-17DRTVWR-525, improve dev's quality-of-lifeDave Houlton
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-528Dave Houlton
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' v6.4.15 into DRTVWR-528Dave Houlton
2021-03-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-02-04DRTVWR-525, improve dev's quality-of-lifeDave Houlton
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01DRTVWR-525 fix build error resulting from 6.4.13 mergeDave Houlton
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
2021-02-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-01-06SL-14035: Don't use sRGB textures when not specifiedPtolemy
2020-11-13Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.cpp # indra/newview/llenvironment.cpp
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-10SL-14264 - ViewerStats added logging of most gGLManager fieldsBrad Payne (Vir Linden)
2020-10-23SL-14150 Fix spellingAndrey Kleshchev
2020-10-22SL-14150 Handle more cases of corrupted cacheAndrey Kleshchev
2020-10-20SL-14108 FIXED Viewer crashes immediately after loginMnikolenko Productengine
2020-10-19DRTVWR-510 clean up obsolete downstream-from-mDebugGPU codeDave Houlton
2020-10-19DRTVWR-510 remove obsolete mDebugGPU variableDave Houlton
2020-10-08DRTVWR-510 remove all LL_SOLARIS conditionalsDave Houlton
2020-09-29Merge branch 'master' 6.4.10 into DRTVWR-510Dave Houlton
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-17SL-13729 Performance of LLUI and LLRender2DAndrey Kleshchev
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 09:19:55 +0000