summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2023-03-30CMake and tests fixups after merge with main for DRTVWR-559Brad Linden
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-03-30Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
2023-03-30Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-23SL-19169 Local material updates aren't applied with non-default transformsAndrey Kleshchev
2023-03-22DRTVWR-559 Fix for bad hashing of materials breaking render batches and who ↵Dave Parks
knows what else.
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-03-10SL-19353 Mesh importer throws an error when the file extension is upper caseAndrey Kleshchev
2023-03-02SL-19281 Unify handling of haze and gamma between fullbright and not and ↵Dave Parks
move haze back to sRGB color space to stay consistent with sky colors. Also fix broken "roughness" stuck at 0.2.
2023-02-27SL-19279: LLGLSLShader::bindXXX is not free. Pack the uniformsCosmic Linden
2023-02-27SL-18882: Show diffuse non-alpha textures opaque on editingAlexander Gavriliuk
2023-02-23SL-19228: Fix GLTF texture transform rotation and add UV debug (PBR only). ↵Cosmic Linden
See textureUtilV.glsl for UV coordinate comments
2023-02-15SL-19121: Add additional test at request of reviewCosmic Linden
2023-02-15SL-19121: Address review comments from SL-19080 phase 2Cosmic Linden
2023-02-14SL-19121: Add some override testsCosmic Linden
2023-02-14Merge pull request #73 from secondlife/SL-19080cosmic-linden
SL-19080: GLTF Material asset consistency: Part 2: Update viewer GLTF Material asset upload to v1.1
2023-02-10SL-19080: Restrict LLGLTFMaterial fields test to a single compiler target, ↵Cosmic Linden
as results can vary between compilers
2023-02-09SL-19080: Address clang-provided errorsCosmic Linden
2023-02-09SL-19080: Update GLTF Material asset upload to v1.1, with stricter GLTF ↵Cosmic Linden
compliance and removal of unsupported features
2023-02-09Merge branch 'main' into DRTVWR-577-maint-SAndrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm
2023-02-07SL-19159 Faster LLUUID and LLMaterialID hashing for std and boost containers ↵Henri Beauchamp
keys (#70) LLUUID and LLMaterialID already have an excellent entropy and value dispersion; there is therefore strictly no need to further (slowly) hash their value for use with std and boost libraries containers. This commit adds a trivial getDigest64() method to both LLUUID and LLMaterialID (which simply returns the XOR of the two 64 bits long words their value is made of), and uses it in std::hash and hash_value() specializations for use with containers.
2023-02-02Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559Dave Parks
2023-02-02SL-18908 Make media texture override base color and emissive texture on PBR ↵Dave Parks
materials when present.
2023-02-02Fix some unused variable warnings in DRTVWR-559Brad Linden
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-01-31SL-19110 Fast hashing classes for use in place of the slow LLMD5, where ↵Henri Beauchamp
speed matters. (#64) This commit adds the HBXX64 and HBXX128 classes for use as a drop-in replacement for the slow LLMD5 hashing class, where speed matters and backward compatibility (with standard hashing algorithms) and/or cryptographic hashing qualities are not required. It also replaces LLMD5 with HBXX* in a few existing hot (well, ok, just "warm" for some) paths meeting the above requirements, while paving the way for future use cases, such as in the DRTVWR-559 and sibling branches where the slow LLMD5 is used (e.g. to hash materials and vertex buffer cache entries), and could be use such a (way) faster algorithm with very significant benefits and no negative impact. Here is the comment I added in indra/llcommon/hbxx.h: // HBXXH* classes are to be used where speed matters and cryptographic quality // is not required (no "one-way" guarantee, though they are likely not worst in // this respect than MD5 which got busted and is now considered too weak). The // xxHash code they are built upon is vectorized and about 50 times faster than // MD5. A 64 bits hash class is also provided for when 128 bits of entropy are // not needed. The hashes collision rate is similar to MD5's. // See https://github.com/Cyan4973/xxHash#readme for details.
2023-01-31SL-19110 Fast hashing classes for use in place of the slow LLMD5, where ↵Henri Beauchamp
speed matters. (#64) This commit adds the HBXX64 and HBXX128 classes for use as a drop-in replacement for the slow LLMD5 hashing class, where speed matters and backward compatibility (with standard hashing algorithms) and/or cryptographic hashing qualities are not required. It also replaces LLMD5 with HBXX* in a few existing hot (well, ok, just "warm" for some) paths meeting the above requirements, while paving the way for future use cases, such as in the DRTVWR-559 and sibling branches where the slow LLMD5 is used (e.g. to hash materials and vertex buffer cache entries), and could be use such a (way) faster algorithm with very significant benefits and no negative impact. Here is the comment I added in indra/llcommon/hbxx.h: // HBXXH* classes are to be used where speed matters and cryptographic quality // is not required (no "one-way" guarantee, though they are likely not worst in // this respect than MD5 which got busted and is now considered too weak). The // xxHash code they are built upon is vectorized and about 50 times faster than // MD5. A 64 bits hash class is also provided for when 128 bits of entropy are // not needed. The hashes collision rate is similar to MD5's. // See https://github.com/Cyan4973/xxHash#readme for details.
2023-01-28SL-19097 Crash when selecting a model for upload and waiting too longAndrey Kleshchev
Should be fixed by SL-18996, but just in case user decides to select a model while viewer closes
2023-01-19Optimizations, decruft, and intel compatibility pass (#53)RunitaiLinden
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-10SL-18820: Fix applying material clearing transform overrides. Loosen some ↵Cosmic Linden
asserts to allow non-default transform overrides.
2023-01-09SL-18820: Update LLGLTFMaterial: Add setBaseMaterial() and equality comparisonCosmic Linden
2023-01-06SL-18741 Add gltf to bulk uploads on macAndrey Kleshchev
And cleaned up dupplicate mScale code
2023-01-03SL-18874 Rigged mesh upload crash when using Bounding Box physicsAndrey Kleshchev
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-12Merge branch 'main' into DRTVWR-568Callum Prentice
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-14SL-18634: Fix GLTF material texture transform not serializing when texture ↵Cosmic Linden
ID is null
2022-11-11SL-18616 Fix for dropping mOverrideAlphaMode on copyDave Parks
2022-11-09Revert "SL-18523: When editing an object's material override, use the ↵Sabrina Shanman
object's material override as a base, rather than its render material (pull request #1190)"
2022-11-08SL-18523: When editing an object's material override, use the object's ↵Cosmic Linden
material override as a base, rather than its render material
2022-11-02Merged in SL-18485 (pull request #1183)Sabrina Shanman
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02SL-18520 Fix for mac build.Dave Parks
2022-11-02SL-18485: Render GLTF materials with extension KHR_texture_transform with ↵Cosmic Linden
approprate texture transforms
2022-11-02SL-18520 Use GLTF material.extras to pass flags for enabling overriding ↵Dave Parks
alpha mode and double sided to default
2022-11-01SL-18520 WIP - Use off-by-epsilon and special UUID identifier hacks to allow ↵Dave Parks
overriding to default values.
2022-11-01SL-18513 Put profile markers around GLTF code.Dave Parks
2022-10-31SL-18442 Port of Caladbolg's fix for emissive overrides not taking. Remove ↵Dave Parks
unused function.
2022-10-31SL-18446 Fix emissive tintAndrey Kleshchev
2022-10-27SL-18411: GLTF material transform serialization, plus fix improper indexing ↵Cosmic Linden
not matching GLTF spec
2022-10-26SL-18472 Fix for assert when increasing number of texture entries on ↵Dave Parks
existing primitive with overrides applied.