From 45bcefd981e268b158d11d59f2ba9063293986a6 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 14 Jun 2022 16:39:46 +0300 Subject: SL-17475 fix remap causing an assert --- indra/llmeshoptimizer/llmeshoptimizer.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/llmeshoptimizer/llmeshoptimizer.h') diff --git a/indra/llmeshoptimizer/llmeshoptimizer.h b/indra/llmeshoptimizer/llmeshoptimizer.h index c76f8a5a89..ea965d6b47 100644 --- a/indra/llmeshoptimizer/llmeshoptimizer.h +++ b/indra/llmeshoptimizer/llmeshoptimizer.h @@ -68,8 +68,10 @@ public: U64 vertex_count); // Remap functions + // Welds indentical vertexes together. + // Removes unused vertices if indices were provided. - static size_t generateRemapMulti( + static size_t generateRemapMultiU32( unsigned int* remap, const U32 * indices, U64 index_count, @@ -78,6 +80,15 @@ public: const LLVector2 * text_coords, U64 vertex_count); + static size_t generateRemapMultiU16( + unsigned int* remap, + const U16 * indices, + U64 index_count, + const LLVector4a * vertex_positions, + const LLVector4a * normals, + const LLVector2 * text_coords, + U64 vertex_count); + static void remapIndexBufferU32(U32 * destination_indices, const U32 * indices, U64 index_count, -- cgit v1.2.3