summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2024-01-08Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
# Conflicts: # indra/newview/llmaterialeditor.cpp
2023-12-06Fix LLGLTFMaterial hashingHenri Beauchamp
This PR fixes the non-working material hashing for LLGLTFMaterial instances. There are several issues in the current code, stemming to the fact that the hashing is performed on the block of the member variables: 1.- There are padding bytes between member variables, even after rearranging them to avoid most of the padding; in particular, the std::array's size is not a multiple of 4 bytes (64 bits), and most compilers will pad them to the next 4-byte aligment as a result. Note that C++ standards do not impose the zeroing of padding bytes on construction of a class instance, with only a couple exceptions (such as explicit zero-initialization). Those bytes MUST therefore be zeroed by us on construction. 2.- The TextureTransform strutcure getPacked() method did not touch some of the packed bytes, and as a result could *potentially* cause an issue for hashing when applied to a transform of another material instance. 3.- With the recent addition of the local textures tracking map, the said map cannot be hashed as a block of memory (map pairs will typically be allocated on the heap or on the stack, not in the memory block used by member variables). This PR solves all these issues and offers proper hashing of LLGLTFMaterial instances.
2023-11-21Fix failure to save the normalized translation data during collada uploadRye Mutt
2023-11-15Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596RunitaiLinden
2023-11-14SL-20340 Fix for off-by-epsilon hack falling off when serializing overrides ↵RunitaiLinden
as LLSD. (#513)
2023-11-13Drtvwr 596 11/8/2023 (#501)RunitaiLinden
* SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials. * SL-20582 Fix for overriding to alpha mode blend not working. Incidental decruft of dead code (thanks, Rye!)
2023-11-08SL-20582 Fix for overriding to alpha mode blend not working. Incidental ↵RunitaiLinden
decruft of dead code (thanks, Rye!)
2023-11-06SL-20523 Ensure override gets updated before render materialAndrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #5Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #4Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #3Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #2Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #1Andrey Kleshchev
Update editor in which texture changed to local
2023-10-25Fix DRTVWR-559 std::array usage in llrender and llprimitive after mergeBrad Linden
2023-10-12SL-20062: Fix near clip on reflection probes being clamped to at or below 10Cosmic Linden
2023-10-09SL-20225: LLGLTFMaterial code syncCosmic Linden
2023-09-22SL-20325 Fix for double sided not working.RunitaiLinden
2023-09-11Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into davep/SL-19842RunitaiLinden
2023-08-29SL-20229 Add GenericStreamingMessage and use it to receive GLTF material ↵RunitaiLinden
overrides
2023-08-23Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-08-11SL-20024: Put material in object inventory when material is no-modify or ↵Cosmic Linden
no-transfer
2023-07-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-07-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp
2023-05-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-05-17Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcharacter/llkeyframemotion.cpp # indra/newview/llfilepicker.cpp
2023-05-03Improved fix for SL-19675 crash. How about just don't refer to data when ↵Brad Linden
you don't need it
2023-04-21SL-19606: Fix missing GLTF texture transforms in PBR alpha mask/alpha blend ↵Cosmic Linden
shadows
2023-04-11SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and ↵RunitaiLinden
brightness to allow ACES Hill all the time.
2023-04-07Merge branch 'main' into marchcat/main-contrib-mergeAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/tests/llleap_test.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/en/strings.xml
2023-04-04SL-19538 Remove hacky ambiance scale and take the mittens off probe a… (#151)RunitaiLinden
* SL-19538 Remove hacky ambiance scale and take the mittens off probe ambiance values. Fix for sky brightening being done in sRGB space.
2023-04-03SL-18458 Make LLVOCache the one source of truth on most recently received ↵RunitaiLinden
overrides. (#147)
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 02:40:09 +0000